Substring bug
Changes merged