Updated logging configuration for more flexibility
Merge branch 'kolais' into develop