Merge pull request #3 from gz5710/master

Test1
Update by Server 1

Upstream test
Test 2