API updates.
Merge branch 'master' of https://github.com/arahlf/Measurements