Merge pull request #31 from guiguoershao/master

23
23
Merge remote-tracking branch 'upstream/master'