Merge pull request #12 from upstream.