Stricter regex
Fixing listener test
Merge pull request #8 from paul91/regex

Stricter regex
:banana: :baby: