Merge conflicted pull request #74