Merging dev branch with master