Fixing issue with subcommands and --help

Fixing issue #110 and #146