Merge branch 'develop'
fix_bug-0.1
solve the conflict