bug fixing
Merge pull request #1 from wang2510/master

test
bug fixing
Merge pull request #1 from fu-xianfeng/master

merge test