Fix regex from #9
Merge pull request #12 from JosephSilber/master

Fix regex from #9