Add notifications
Merge origin/master