Updated email regexp