Merge pull request #4 from Sampergao/master

Merge pull request #1 from gaodong/master
Merge pull request #5 from Sampergao/master

Update Server.java
Update Server.java
Merge pull request #3 from gaodong/master

please update server.java