Merge pull request #1 from fu-xianfeng/master

merge test