Moving dev branch code to master branch