Change future flag to true
Merge branch 'master' into gh-pages