Manually merged pull request #41