Made order independent, and tested by permuting integer identifiers and
triple order
Merge branch 'master' of https://github.com/Data2Semantics/d2s-tools.git