fix some error
Merge branch 'develop'