made email matching regex more general