Merge pull request #22 from jrv7/D00019

Merge dos branches D00019 e D00021 - Atualizando o D00021
Merge pull request #24 from jrv7/D00021

Merge pull request #22 from jrv7/D00021