Merge pull request #139 from josemoracard/jose6-20.4-Map-data-types

Merge pull request #139 from josemoracard/jose6-20.4-Map-data-types #247