PR #28 feedback.