Merge pull request #5 from shawnjohnson/patch-4