Addition to yesterday's map code
Cleaned up after yesterday's late night
Merge remote-tracking branch 'origin/master'