Fixed word wrap issue
Merge branch '2.0'