tutorial++
tutorial 1.1
merge master