Fixed bug in joinEvent
Merge remote-tracking branch 'origin/master'