pygeoif

214fea35 - merge type-annotations into develop, resolve conflicts