manually merged pull request #99