Fixed bowfight listener
Merge!
Merge remote-tracking branch 'origin/master'