Merge pull request #15 from CodefoundryDE/map

Map