Merge branch 'gh-pages'
set locate control to zoom
Merge branch 'master' into gh-pages