changes in response to bostanio's comments on pull request #34