hotfix added

Signed-off-by: Osvaldo Calles <ocallesp@pc-linux.(none)>
Merge branch 'hotfix' into development