Merge pull request #2 from sy264115809/master

合并烧鱼更新！！
Merge pull request #3 from TedHacker/master

Merge pull request #2 from sy264115809/master