finish refactor
Merge pull request #1 from joaoneto/master

finish refactor