Merge pull request #165 from pedrofvteixeira/CDF-205

[CDF-205] core-refactor