Fixed assignemnt of tasks.
Merge branch 'assign_tasks'