Updated version of slides.
Merge branch 'solution'