sdboyer Merge pull request #222 from vergenzt/patch-1 …