Manual merge of Pull Request #10 by @systemed (could not auto-merge due to change of data layout to GeoJSON)