minor corrections added to pull request to fix issue #21