Got rid of reference to measurement class

Fixes #18