Updates for the comments from the pull request #196