fix some bugs
finish v1.1
Merge branch 'dev' since finish v-1.1