Issue765

code review is done.