Lab1 fix
Merge branch 'lab1_done'