修复1.0bug
Merge branch 'hotfix/1.0bug'