bring back lenient wrapping unless classes is explicitly set
rename variable for clarity
Merge pull request #171 from dannyroberts/lenient-wrapping

bring back lenient wrapping unless classes is explicitly set