Merge pull request #132 from dotlambda/patch-1