[CDF-238] - Reviewing build process
Merge pull request #15 from pamval/master

[CDF-238] - Reviewing build process