Merge pull request #3 from xiaolinggithub/master

1
Merge pull request #4 from xiaolinggithub/first

Merge pull request #3 from xiaolinggithub/master