Merge pull request #1 from gztest/master

get newest version of server
Test 5
Merge pull request #5 from gz5710/master

Test 5