Closes #264 - Improved email validation