Merge pull request #3 from FLHerne/master

Remove mostly-duplicate 'Map' array