applied remarks for pull request #1