A lot of modifications
Merge pull request #1 from arfurlaneto/master

Modifications