Merging the dev branch into master