Gauri

merge from gauri branch