Add measurement_origin

Implements #53