Manually merge PR #4