Merge pull request #1 from lichzero/master

7.29合并