fix subcircuit
parser modif (from maven)
Merge branch 'feature-fixsc2' into develop