Feature/5

See websharks/comment-mail#5