Merge pull request #1 from zhaoda/master

merge
Merge pull request #3 from Tencent-BJF2E/master

Merge pull request #1 from zhaoda/master