2.0 release..word wrap fix