Merge pull request #829 from Rondom/rondom-add-cpe-ids