PR #68 feedback.