Updated email sig
Added the final commit from master!

Merge branch 'master' into ngap