Use click event instead of touchstart
Merge branch 'master' into gh-pages