Improves options parsing
Adds tests for invalid options
Bumps up version