Updating master branch
Coverage conflicts deleted