Merge pull request #26