refactoring needed to parse geometries
Merge remote-tracking branch '52n/master'