Merge pull request #1 from daradib/master

Cleanup, new commands, raising exception on command failure