Merging to the master branch