Handling states between commands
Cleanup
Merge pull request #30 from efraimgentil/master

Handling states between commands