final version of tut part one
Merge branch 'release/1.0' into develop