Merge pull request #485 from iamqizhao/master

Expose peer info on server side