Merging changes from master repository