Support -h
Prefer simpler command-line options
Merge pull request #4 from c9/simplify-command-line-options

Simplify command line options