Merge branch 'develop'
Merge branch 'fixbug0.1' into develop
修复bug1和添加新功能