Complete last commit.
Merge pull request #240 from jhps/measure-tool-linger

Incremental additions to measure tool (complete commit)