Merge pull request #219 from fragmer/master

Improved logging