message notifications implemented
Merge origin/master