Fixed peter's bitching
Merge branch 'workers' into workers2