Variables now working

Change-Id: Ib465fa42707f7924a6506360d9f759ec5d003b35
Signed-off-by: Marcelo Portilho <marceloport@gmail.com>