Merge branch 'task2'