Merge pull request #124 from dadbodgeoff/remediation/measurement-hardening