manually merge PR #141