Update to adjust column count with upstream
Merge pull request #1 from cbaesema/folsom

Update to adjust column count with upstream