added modified cpp files from tutorial
Merge branch 'release-0.2-rc1'