Fixed bug in client/worker mode
Merge branch 'master' into buddy