Chnages complete as per chetan's comment of 21st april
#25
development_feature_25