Perfect server that bit more perfect
Merge pull request #6 from conorbrady/master

Server updates