Gen7

Here's a fix for the signed-ness issue reported in Issue #26