Merge branch 'lab3'