Merged class Gate, Measure, MeasureD
Some small new features