Added Measurement class, Fixed Resharper errors