Merge branch 'develop'
fixed typo
remove old command folder
Merge branch 'master' into develop
add comments