Merge pull request #131 from pinguo-lihai/Feature1

1
dd
dd
Merge pull request #132 from pinguo-yangbing/hotfix

Hotfix
test