Merge pull request #22 from jrv7/D00021

Merge dos branches D00019 e D00021 - Atualizando o D00021