Sorting and better indicators
Merge branch 'master' into gh-pages