Duplicate event listener. Fix #158 and Fix #144
Merge pull request #159 from jtorrente/issues-144-158

Duplicate event listener. Fix #158 and Fix #144