Merge pull request #4 from ivernaloo/master

update the server
Merge pull request #4 from zszc/master

Merge pull request #4 from ivernaloo/master