Addressed Elliot's comments on pull request #27.