Improve tutorial (feature #7)