Refactoring
Merge pull request #11 from ajardin/feature/refactoring

Refactoring