Small tweaks
Merge pull request #1 from sfkaos/feature-add-esri

Small tweaks