Merge pull request #475 from danvk/checked-options