Merge pull request #52