Merge pull request #270 from ggreif/patch-1