Merging pull request #39.