Merge pull request #1 from shawnjohnson/patch-1