简化roll
Merge branch 'master' of github.com:FoOTOo/ZhuHai