Commit #5 added ListenerService. Still does not work right
Merge remote-tracking branch 'origin/master'