Merge pull request #10 from shawnjohnson/patch-10