Implemented the changes introduced by the pull request #36.