Add sorting
Merge branch 'master' of github.com:possiblywrong/generic-data