Improved Server to be more flexible.
Merge branch 'master' of https://github.com/troiganto/overtop