Updated the config file
Merge branch 'develop'

* develop:
  Updated the config file