Service (working) and Notification (to be fixed)
Merge remote-tracking branch 'origin/master'