Improve usability of CLI options. Bump version.