Added Strict folding (Issue #1)