Added ellipses, tidied up the regex a bit