Merge pull request #45 from carlosrusso/master

[CDE-211] Fixed issue