Sorting fix finished
Merge pull request #5 from Blackmoor/test-Tyler

Sorting fix finished