Merge pull request #12 from mweastwood/improvements

Make the MeasurementSet interface more consistent