Merge pull request #1349 from jbraeuer/master

Add slides from Felix Hupfeld.