some bugs fixed
Merge branch 'dev'