added mailer and export variables
 merge package