Added updateNotification method (work in progress)
Merge origin/master