Merge pull request #1 from fu-xianfeng/master

merge test
Merge pull request #2 from wang2510/master

Merge pull request #1 from fu-xianfeng/master