Commited files
Merge branch 'Dennis2'
Config fix