email changes
Merge branch 'EmilRojewski'