Fix option parsing
Merge pull request #107 from agrimm/fix-option-parsing

Fix option parsing