Grep Plugin pull request with code review applied

Hi,

New pull request with all code review feedback applied.

See commit: 48ff73a086a95e2c34940e6e7317fed3c7ebccc4

Thanks in advance :wink: