add functionality as observer
Merge remote-tracking branch 'origin/master'