Feature/edit email

Closes #111 and #101