Cleanup a bit
Merge branch 'master' of github.com:jfelsinger/measurement