Adding the final touches to the presentation
Merge branch 'master' into gh-pages