properly setup listeners
Merge pull request #388 from nelenkov/dev

properly setup comment listeners