Updating master branch with affine fixes from the LKT-Normal branch.
Also added the setup mail script.