updating config file
Merge branch 'dev'