More permissive regex. Again.
Merge pull request #13 from JosephSilber/master

More permissive regex. Again.