merge PR #633