Merge pull request #11 manually.