ISSUE #9 - Fixed broken measuring tool
Merge branch 'ISSUE_9'