Improve help text, add short-hand options.
Merge branch 'develop'

* Add short-hand options.