Merge pull request #1 from Trinea/master

与原作者更新合并