Changed the regex to a better one

Now doesn't match empty strings, therefore faster. Sorry, forgot to do that in the earlier pull request... Really is change of one char, but makes a substantial difference..