Added MAPBOX to index
Merge origin/master