Fixing revert commit for pull request #31 - Part 2.