Better log output
Merge pull request #23 from scboucher/master

Better log output