fixed log message
Merge branch 'master' into refactor-config