Slightly improved regex