Merge pull request #214 from nhr/master

Typo fix + regex fix