fix some mistake
Merge branch 'develop'