More tutorial improvements
Merge branch 'master' into develop