patches for pull request #15
Merge pull request #24 from jgritman/patch-pr-15

patches for pull request #15