My code gives errors, just comitting to get the new code
Fixed istring.c merge conflict