Commit from Master

Adopting new changes