Merge pull request #32 from guiguoershao/master

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