Whitespace
Barf on invalid commands
Merge pull request #17 from richo/master

Barf on invalid commands