Revert Nori change
Refactor as instance method, special case of String#scan
Merge branch 'master' into extract