Backlog/112

Mainly implements issue https://github.com/telefonicaid/fiware-connectors/issues/112.

It implements issue https://github.com/telefonicaid/fiware-connectors/issues/104 as well.
Only indentation chagnes in this part? (Hard to know in the githbub.com diff)