Merge PHPMailer implementation from Develop

#47