better option parsing and tests
v0.1.3