Server Fix
Merge pull request #28 from halzate93/master

Server Fix