Fix, by now, unnecesary calls to create listeners.
Merge pull request #14 from danieltardon/development

Fix, by now, unnecesary calls to create listeners.