Merge pull request #392 from stianst/master

Server config