Tutorial 3

Merge the tutorial-3 branch on master.