Improve logging
Merge pull request #181 from elyezer/master

Improve logging