Better syntax in config files
Merge remote-tracking branch 'origin/master' into server