fix bugs
Merge branch 'develop' into me