Actually I think the better regexp is http://rubular.com/r/XWDa2mOf1j

We need to write a test to it too.

cc @britto