basic
fix some bugs
Merge branch 'develop'