Listener updates
Merge branch 'master' of https://github.com/zian92/SoPra