Changes in Gopi Master

I'm Commiting this from Gopi Master to Master