proper handling of classes an zerowidth, jnthn++
Merge pull request #1 from zhuomingliang/patch-1

 proper handling of classes an zerowidth