Renamed references to Worker to use Soldier instead.
Merge branch 'issue33' into develop