Fixed an error related to reading strings.
Merge remote-tracking branch 'origin/master'