Adding updates from develop branch and adding them to master branch