Merge pull request #128 from dadbodgeoff/remediation/security-convention-s1