Use command and some renaming
Merge pull request #1 from wilbertom/master

Use command and some renaming