Fix sort issues with multiple sort fields
Merge pull request #254 from emmanuel-keller/1.5

Fix sort issues with multiple sort fields