Corrigidos bugs contra xsd
merge
Merge