Return strings by non-const value.
Merge pull request #621 from Morwenn/return_non_const

Return strings by non-const value.