Tidy up feedback model listener.
Merge pull request #146 from greboid/master

Tidy up feedback model listener.