Merging in pull request #36