Fix issue #42: incorrect help text
Merge pull request #43 from timothycrosley/feature/fix-issue-42

Fix issue #42: incorrect help text
Merge in latest changes from development