Better options handling, easier to add future options
Bump version