Added config.js
modified for log statement
Merge branches 'hotfix-1' and 'master'