Merge branch 'staging'
improve logging configuration
Merge pull request #184 from mistio/logging

Logging