Merge pull request #509 from iamqizhao/master

Tune the server accepting code