Add space after comma
Change command class
Add space after comma
Merge pull request #184 from jmolivas/issue_171

Issue 171 - Update test