Improve logging config
Merge pull request #693 from elyezer/logging-config

Improve logging config