Merge dev with master branch