Simplify the regex considerably

Not quite sure what I was thinking with that one
Add option to allow gaps