Fix the sub command detection
Correct the sample sub command name
Fix sub command parsing

Merge branch 'fix-sub-command-parsing'