improve logging
Merge pull request #4238 from qunox/loggerimprove2

improve logging