Merge branch 'master' with some bug fixing

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