Merge pull request #116 from dadbodgeoff/remediation/w5-vocabulary