Moving email notication to separate function
Moving email notication to separate function
Merge branch 'develop'