Merge pull request #5 from Ariequ/master

合并