changing name to Lustro
fix merge