Fix issues with CLI help
Merge pull request #74 from gscshoyru/fix-cli

Fix issues with CLI help