Better message logging [fix #17]
Merge pull request #19 from breach/fix17

Better message logging [fix #17]