Merge pull request #51 from ezfe/master

Fixed /server
Merge pull request #2 from MasterEjay/master

Merge pull request #51 from ezfe/master