Remove highlight by clicking the empty space
Merge branch 'master' into gh-pages