优化代码
Merge branch 'develop' of https://github.com/nezhazheng/cmgr into develop