Fixed bug in 2-torsion and flags are relabeled
Merge remote-tracking branch 'ariel/master'