Regex is hard

Apparently.
Merge pull request #2 from RaikesCohort2013/Mike_IWasntDone

Regex is hard