Manually merged pull request #182