Merge branch 'fixing/MeasuresClass'