Merge pull request #25 from JoshCheek/patch-1