Code refactor proposal
Merge pull request #1 from marcferna/master

Code refactor proposal