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

Switch to new server implementation