Tried to address comment #99 feedback. I have added patch for same. Please re...