dynamic map height for large displays
Merge remote-tracking branch 'origin/master'