Added Measure.type and Measure.question (Bug #2)