Merge pull request #1 from sonic0828/master

 sonic0828的合并修改
Merge pull request #2 from sonichtml/master

Merge pull request #1 from sonic0828/master