Fix for issue #5
Roll back sort changes
Merge remote-tracking branch 'remotes/superdweebie/master'