improve logging
Merge pull request #3 from hadim/master

improve logging