email notification set to false
Merge remote-tracking branch 'origin/master'