Tested and improved PCRE