Various fixes
Merge branch 'dev' of https://github.com/GeographicaGS/Elcano-iepg into dev
Merge with dev