Incorporated Comments on the pull request