added from forem-notif-fix
Merge pull request #34 from alexscarp/notif-phase2

Notif phase2