Now checking only after . after @ of email address
Merge branch 'master' of github.com:malteseunderdog/fielderic