Sort order is set to the actual results
Merge branch 'master' into bug/sort-order
fixes #50