Refactored the inner Listeners class, to reduce code duplication as much as possible.
Merge branch 'master' of github.com:golvmopp/sdmapeg