Merge pull request #535 from iamqizhao/master

Close ServerTransport instead of the raw connection