Add an option to disable char wrap

This is an updated version of #449 to resolve merge conflicts and get a clean PR.