Serverside
Merge pull request #11 from KILL-MementoMori/ServerBranch

Serverside