Improved log messages
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #5 from jansoren/develop

Improved log messages