Merge pull request #1 from qiushibaike/master

update