add header in email and legalese
Minor changes
Merge remote-tracking branch 'origin/master' into dev