Merge pull request #172 from afrjorge/master

[CDF-205] - CDF core-refactor