Changes incorporated and defects removed

Kindly review and merge