Merge branch 'bugfix/adapt_to_geopandas_changes' into 'master'

Fixed issue #31 (ValueError: Unknown column geometry). Fixed issue #32...

Closes #31 and #32

See merge request !5