Clean up and add feature: validate email.
Merge remote branch 'ghsmplib/development' into development