manually merge pull request 4