emails working
Merge branch 'klc'