refactoring completo, alpha 2
Merge pull request #2 from marcelom/refactoring

refactoring completo, alpha 2