22/05: Final merge with word wrap
Merge pull request #32 from Clerish/patch-2

22/05: Final merge with word wrap