Merge pull request #2 from zhaoda/master

merge from zhaoda:master
Merge pull request #4 from Tencent-BJF2E/master

Merge pull request #2 from zhaoda/master