Sorry about the previous commits... that was a typo.  This one adds the character wrapping support.