Updated to latest version(+Jordi's changes)

Signed-off-by: jonathan7 <jjs1mail@gmail.com>