Text now wraps
Merge branch 'myWork'