improved sorting, changed popup text
Merge branch 'master' into gh-pages