Merge pull request #39 from tpkelly/develop

Fix merge conflicts for develop->master
Merge pull request #41 from tpkelly/develop

Fix for missing options in new optionset