pulling the master to mine since you too added bunch of changes

pulling the master to mine since you too added bunch of changes,

I hope I am doing the right way!!!