Updated docstrings and addressed review comments in pr 1295
Merge pull request #1312 from sghai/comments_1295

Updated docstrings and addressed review comments in pr 1295