Merge pull request #44 from pedrofvteixeira/CDE-210

[CDE-210] Style "Clean" currently does not support i18n
[CDE-211] Fixed issue
Merge pull request #45 from carlosrusso/master

[CDE-211] Fixed issue