[CDE-162] Improving solution
Merge pull request #20 from jvelasques/master

[CDE-162] Improving solution