Added Notification (first attempt)
Merge remote-tracking branch 'origin/master'
Merged changes