add one future feature.
Merge branch 'gh-pages' into presentation