added support for map overlays
Merge branch 'master' into gh-pages