Merge pull request #139 from pinguo-fenghaiting/Feature1

Feature1
+7
Merge pull request #140 from pinguo-liuhongwei/Feature1

+7