Email fixes and tags first version
MERGE