Refining geo-sort, hopefully better performance.
Improving performance
Merge branch 'master' into gh-pages