Making changes as per comments in pull request #107.