mhetrick Merge pull request #21 from giogramegna/patch-1