Merge pull request #642 from afs/iso

JENA-1789: Isomorphism fix and refactor