Merge branch 'sorting' into develop

this closes #94
this closes #136