Changes made by Pushpender Singh (pushpenders@redbytes.in).