Merge pull request #75 from juizmill/development

Development --
First cleanup
Merge pull request #79 from danizord/hotfix/cleanup

Limpeza
Merge pull request #82 from danizord/master

Reparos