Minor Changes: Changed listener type
Merge branch 'master' of https://github.com/ChristopheVilleger/mediasphere