Task1 review round 2
fix after 2round review
Merge branch 'master' into task_2