Better Option support
Merge pull request #13 from chrhicks/option_fix

 Better Option support