Merge pull request #38