Merge pull request #9