Bug/153 (into develop)

Twin of PR https://github.com/telefonicaid/fiware-connectors/pull/161