update tutorial
Merge branch 'master' into Lab2