Merge pull request #499 from Tivix/master

Notification fixes