worker bug fixed
Merge branch 'hot_fix_worker' into develop
Fixes #23
Merge branch 'develop'