merge PR #63