A couple modifications
Merge pull request #3 from bovard/server

A couple modifications