Merge pull request #3 from CommunityHelp/master

merge
Merge pull request #23 from zhiyao998/master

Merge pull request #3 from CommunityHelp/master