Finished the ajustments
Merge pull request #5 from mateusguerra/master

Finished the ajustments