my first commit
Merge pull request #4 from pinguo-liuhongwei/Feature1

my first commit