PR #20 feedback.