Changes from Master

Changes from Master