Merge pull request #8 from shawnjohnson/patch-8