Merge pull request #32