Modified regex to support CFL

Didn't do the extreeeeeeeeme regex to generalize header data.  I'm too stupid to figure that out.