updated to position the map-flag  properly
Merge branch 'master' into gh-pages
compiled changes merged from master