Address pull request #123 feedback