Changed the regex to a better one

Now doesn't match empty strings, therefore faster.