Change from PR. [Issue #7]