Update pull request with changes suggested by @Adam-