Modified cmd validation
Merge branch 'hotfix/0.0.2'