Fix for String index out of bounds exception.
Merge remote-tracking branch 'origin/master'