Improving the server as outlined in issue #1
Merge pull request #3 from etuchscherer/Issue-#1

Improving the server as outlined in issue #1