switched from Events to queue to avoid index out of range,
and other weired multithreading bugs
Merge remote-tracking branch 'origin/master'