Merge pull request #39