Added simple implementation of ExpectedMeasure evaluation
Temporarily changed some code to be Java 6 compliant