Merge pull request #27