Merge branch 'lab1' into lab2