Get up to date with delano master

up to date with delano master