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

New server version