Fixed server
Merge pull request #103 from andrewblond/fix-server

Fixed server