Smtp v3

Should address the comments request #12