bug fixs
Merge branch 'dev'