Updated regexes for issue 17