added jeremybmerrills changes to regex