Fix commands bug
Merge pull request #22 from ninjadev/commands-fix

Fix commands bug