build parameters for the email in correct order
Merge remote-tracking branch 'origin/master'