bug/172

Fixes the issue https://github.com/telefonicaid/fiware-connectors/issues/172

This PR should partially (or totally, still under study) fix the issue https://github.com/telefonicaid/fiware-connectors/issues/68 as well.