Merge pull request #1 from kevin1024/master

合并