merge PR #626