Refactor Arguments on Commands
Merge branch 'develop'