Merge pull request #12.