shiro 添加
Merge pull request #15 from JSHgithub/master

a new pull request for chirowong
Merge pull request #76 from chirowong/master

merge everybody to qatang
Merge pull request #2 from qatang/dev

merge qatang dev