Merge pull request #25