changes implimented as mentioned in amit patel's comment of 19 april
#25
development_feature_25