Merge pull request #25 from pengqin/dev

Dev
Merge pull request #26 from pengqin/dev

Dev
恢复文件
Merge pull request #28 from hopesfish/dev

Dev