Merge pull request #278 from danvk/typed-options