Merge pull request #49 from conorfennell/master

sending email addresses and regex
Adding more tests