fix bugs
Merge branch 'dev_branch'