some bug fixed
Merge branch 'develop'