Hand-merge PR #74