pzavolinsky Merge pull request #15 from jesseskinner/patch-1 …