Added listeners
More pull request messup fixes
Merge pull request #4 from DiogoNeves/feature/listeners

Fixed pull request messups