fix presentation
Merge branch 'master' into presentation