implemented optional opt param
Merge branch 'mapbox-remove-constants'