Mixed changes

Signed-off-by: vrodri3 <victor.manuel.rodriguez.bahena@intel.com>
Merge branch 'master' of https://github.com/VictorRodriguez/diet-dev