adding more functionality to the listeners
Merge branch 'master' of https://github.com/socho/edx