- Refactored pull request #14.