merge PR #624