Improve name mapping for GeoJSON format
Merge branch 'release/v0.0.4'