EventHandler implemented
Merge remote-tracking branch 'origin/ui' into businesslogic
Changed observer to 'Object'