fix tuple generation (just a patch, needs to be revamp)
Merge branch 'feature-mzn2' into develop