Feature/format email

Fixes #62