Switch to new server implementation
Merge pull request #42 from wagnert/master

Switch to new server implementation