Completely refactor measure tools
Typo
Address @voisardf's review
Merge pull request #159 from kalbermattenm/refactor_measure

Completely refactor measure tools