Merging branch to master