Task #253: Add email validation.
Merge branch '253' into test