Merge pull request #22 from viruga/master

Atualizando
Merge pull request #68 from inobrega/master

Merge pull request #22 from viruga/master