Merge PR #6