Merge pull request #2 from yuyepaoniu/master

n
m
Merge pull request #4 from bananaxzw/master

m