Merge pull request #8 from murrekatt/develop

Even more cleanup of the server