Merge pull request #21