Merge pull request #1 from MasterEjay/master

Syncing
Fixed /server
Merge pull request #51 from ezfe/master

Fixed /server