Merge pull request #104 from pinguo-lihai/Feature1

Feature1
test
Merge pull request #108 from pinguo-shenqiang/master

test
test
test
test