Allow more accurate point selection
Merge branch 'master' into gh-pages