manually merge pull request 28