Fix quality regression
Fix quality regression
Merge pull request #12 from PedroTroller/fix/refactoring

Fix/refactoring