delivers 41438505 42635327 42635441 41438617
Fix breaking tests (sort_name issues)
Merge pull request #254 from hudmol/sort-name-bug-fixes

Delivers 41438505 42635327 42635441 41438617