Merge pull request #17 from 30x/fix-event-listener-bug listener was being added on every loop, accumulating listeners