Better command layout.
Merge pull request #33 from facundobatista/master

Better command layout