Updated MapViewer class.
Merge remote-tracking branch 'origin/master'
Updated MapViewer.