Feature/17

See: websharks/comment-mail#17