Added email method
Merge in changes