Improve string a bit
Merge pull request #242 from vuntz/improve-string

Improve string a bit