@@ -348,11 +348,12 @@
 - removeLeadingWhitespaces
 {
 	size_t i;
 
 	for (i = 0; i < length; i++)
-		if (string[i] != ' ' && string[i] != '\t')
+		if (string[i] != ' '  && string[i] != '\t' &&
+		    string[i] != '\n' && string[i] != '\r')
 			break;
 
 	length -= i;
 	memmove(string, string + i, length);
 	string[length] = '\0';
@@ -373,11 +374,11 @@
 	size_t d;
 	char *p;
 
 	d = 0;
 	for (p = string + length - 1; p >= string; p--) {
-		if (*p != ' ' && *p != '\t')
+		if (*p != ' ' && *p != '\t' && *p != '\n' && *p != '\r')
 			break;
 
 		*p = '\0';
 		d++;
 	}
@@ -400,21 +401,22 @@
 	size_t d, i;
 	char *p;
 
 	d = 0;
 	for (p = string + length - 1; p >= string; p--) {
-		if (*p != ' ' && *p != '\t')
+		if (*p != ' ' && *p != '\t' && *p != '\n' && *p != '\r')
 			break;
 
 		*p = '\0';
 		d++;
 	}
 
 	length -= d;
 
 	for (i = 0; i < length; i++)
-		if (string[i] != ' ' && string[i] != '\t')
+		if (string[i] != ' '  && string[i] != '\t' &&
+		    string[i] != '\n' && string[i] != '\r')
 			break;
 
 	length -= i;
 	memmove(string, string + i, length);
 	string[length] = '\0';