Fix few bug
Merge branch 'dev'