Merge pull request #1 from RMerl/master

同步原作者的更新