Various fixes
Merge pull request #8 from Scarygami/GeoJson

Various fixes