Merge "Fix of bug in Notificator class"