Removed config to global location
Merge branch 'master' into devel