Merge PR #4.