Merge pull request #9 from jsuchome/master

port from SP3
- sort array keys to have deterministic the same test output
- 2.24.2