Changed to @email
Merge pull request #1 from camillef/master

Changed to @email