merge PR #630