Merge pull request #11 from marceloliveira/master

Recuperando alterações do Master
Merge pull request #15 from marceloliveira/augusto

Merge pull request #11 from marceloliveira/master