Merge pull request #45 from crotger/master

Sorting Fixes