Fix master branch
Fix dev branch
Merge branch 'dev'