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

Switch to new server implementation