Just some config

Title says it all...

Merging