Removed simple queueing and replaced with normal queue
Merge remote-tracking branch 'origin/master'