merging all the changes to the master branch