Add support for point and linestring geometries
Merge branch 'develop'