Merge pull request #28 from koalaaaa/master

Tidy up commands, and make them output when things go boom