Merging master branch to dev