New server version
Merge pull request #88 from iceglow/cleanup

New server version