Merge pull request #1 from kavilee/master

合并原作者的更新