Merge branch v1.0 (commit fb1987b) into master

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