bug fixing
Merge branch 'dev'