Merge pull request #371 from micmac1/kama-cve