Merge pull request #1 from ysc/master

合并原作者的更新