Merge pull request #8