Fix (#9)
Merge pull request #20 from collective/better-messages

Fix (#9)