Doing chapter 7 \o/

It's faster as 2 regexes.