Fixes
Merge pull request #2 from MadkillerMax/patch-1

Patch 1
More fixes
Fuck you clientside
Merge pull request #39 from MadkillerMax/dev

Fixes from Max's shit