Merge pull request #208 from pamval/master

[CDF-296] - publish still not correct
[CDF-296] - publish still not correct