Refactoring and using the consumer and producer threadpool
Merge remote-tracking branch 'origin/master'