Add some specs
Refactoring
Some refactoring
Merge pull request #1 from PedroTroller/refactoring

Refactoring