Merge pull request #91