Fixed the logging handler
Merge branch 'fix-logging-handler'