Merge pull request #12 from CodefoundryDE/map

Map