Merge pull request #22 from ylnb91/master

合并到主分支
Merge pull request #9 from tidezyc/master

是