Merge dev branch to master branch