added word wrapping for error messages
Merge branch 'master' of github.com:ameily/pypsi