Several improvements
Merge branch 'dev-malkab' of https://github.com/GeographicaGS/elcano-iepg into dev
Bugfixing á gogo.
Merge branch 'dev' of github.com:GeographicaGS/Elcano-iepg into dev-malkab