Fix worker removal
Merge branch 'master' of github.com:normanjoyner/echelon