Merge pull request #11 from rhonda/patch-1