Move Changes from Gopi Master to Master

I'm Commiting this from Gopi Master to Master