switched from Pipe to Queue
Merge branch 'iss34-queue' into iss34