nsonnad Merge pull request #8 from tristanfisher/patch-1