Add some handling of option_type
Merge pull request #90 from mwiebe/option_type

Add some handling of option_type