Fixed waiting to use BlockingQueue instead of wait/notify.
Ready for 0.8.1-5