Cleaned up config file
Merge branch 'master' into source