Merge pull request #1 from wanggang198810/master

合并刚哥的更新22