merging dev with master branch