emails module added
merged