ngreenstein Merge pull request #8 from orta/patch-1 …