Merge pull request #1 from luwei0917/master

ni hao
Merge pull request #23 from andyjiang007/master

Merge pull request #1 from luwei0917/master