fixed strstr()
small correction to substr