Merge branch 'task_1'