Done Task 2 and 3
Merge branch 'master' of https://github.com/ModeraInfra/job_task