Merge pull request #3 from shawnjohnson/patch-3