fix a typo
fix presentation sample
Merge branch 'master' into gh-pages