[Docopt](http://docopt.org/) seems like a good option to improve the CLI. Will start work on adding support.