Merge pull request #445 from annando/new-worker