Merge with alesitalugo last version