change queue to arrayblocking queue
Merge branch 'two-dot-o' into two-dot-o-events