a more idiomatic version of the server
Merge pull request #1 from yogthos/patch-1

a more idiomatic version of the server