Merge pull request #14 from jvettraino/master

ECDR-42: CDR CTK Compliance