Refactor Cli::Options.
Merge pull request #279 from troessner/refactor-cli-options

Refactor Cli::Options