removed debug messages, added listener events, added small thing
commit to merge
Merge branch 'master', remote-tracking branch 'lukas/master'