address jbenets comments on the pull request #1