commit by parag on 10/July/2014