Starting to implement corrective-function for map generation.
Merge remote-tracking branch 'upstream/master'