Merge pull request #9 from shawnjohnson/patch-9