Added Stu's regex to
Modified a bit to make it non-capturing