merge v1.0 commit 9aea043 on master

Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>