Merge pull request #1 from dodgepudding/master

合并原作者的代码