Merge pull request #1 from happykevins/master

合并代码