Merge pull request #24