refactor options logic
complete command line tests
bump version