manually merged pull request 36