Server test
Merge pull request #13 from SunJieMing/master

Server test