set tap_always to false in demo
Merge branch 'master' into gh-pages