Merge branch 'master' into gh-pages
sort points from top to bottom
Merge branch 'gh-pages'