Fixing a sorting bug...
Merge branch 'work_branch'