Refactor
Merge pull request #3 from fellipebrito/refactor

Refactor