added email handling
20130622 update