Merge pull request #163 from afrjorge/master

[CDF-205] - CDF core-refactor