Merge pull request #15 from shawnjohnson/patch-14