Manolo Pajaro, branch TEST
Merge branch 'master' of https://github.com/yuxiandresd/yuxi_training