Changed Email pattern to match more generic input format, fix #1