Merge pull request #2 from zhuyoufeng/master

Merge pull request #1 from ieiayaobb/master
Merge pull request #2 from ieiayaobb/master

Merge pull request #2 from zhuyoufeng/master