Improved logging #2

Will be a long list until I realize how to put together all the things.
Merge pull request #5 from iRazgriz/patch-6

Improved logging #2