Pace - finished MapReader and added some getter/setters to Map.
Merge remote-tracking branch 'origin/master'