Make the server function serve without errors.
Merge pull request #4 from m-allanson/upstream

Make the server function serve without errors.