Finxed #771

Tried to take care of all the feedback given in previous PR for allowing multiple line in comments