Merge pull request #43 from pinguo-tanglei/Feature1

Feature1