PR #25 feedback.