Issue Fixed and Documentation Updated