Initial version of map overlay
Merge remote-tracking branch 'origin/master'