FIX improved implementation
FIX improved implementation

telefonicaid/fiware-orion,telefonicaid/fiware-orion,telefonicaid/fiware-orion,telefonicaid/fiware-orion,telefonicaid/fiware-orion,telefonicaid/fiware-orion