Merge pull request #1 from geksong/master

合并原作者的更新