fix the hello-world tutorial
Merge branch '2_10'