Updated to last version without compilations errors