Merge pull request #22