Second comit

Change-Id: Idee3ad05aae4134b9e6cfaa77cd3681b2f9d2976
Signed-off-by: tronzeus <mauricio.mendoza@gmail.com>