Better help, especially showing defaults.  Fixes #12.
Merge branch 'issue-12' into develop