Notifications fixed (should work but didn't tried yet)
Merge branch 'Alexandre'