Merge pull request #7 from bananaxzw/master

Master
m
Merge pull request #6 from yuyepaoniu/master

m