Fix #88 - Used wrapper function to remove listener.
Merge pull request #90 from vreixo/issue88

Fix #88 - Used wrapper function to remove listener.