Merge pull request #494 from ollie27/strings