diff --git a/Jupiter/ArrayList.h b/Jupiter/ArrayList.h
index 128bd61..3bfe610 100644
--- a/Jupiter/ArrayList.h
+++ b/Jupiter/ArrayList.h
@@ -182,8 +182,8 @@ template<typename T> void Jupiter::ArrayList<T>::empty()
 
 template<typename T> void Jupiter::ArrayList<T>::emptyAndDelete()
 {
-	for (size_t i = 0; i < Jupiter::List<T>::length; i++) delete Jupiter::ArrayList<T>::data[i];
-	Jupiter::List<T>::length = 0;
+	while (Jupiter::List<T>::length != 0)
+		delete Jupiter::ArrayList<T>::data[--Jupiter::List<T>::length];
 }
 
 template<> struct _Jupiter_DataBuffer_partial_specialization_impl<Jupiter::ArrayList>
diff --git a/Jupiter/IRC.h b/Jupiter/IRC.h
index eb05d50..1b4517b 100644
--- a/Jupiter/IRC.h
+++ b/Jupiter/IRC.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2013-2014 Justin James.
+ * Copyright (C) 2013-2015 Justin James.
  *
  * This license must be preserved.
  * Any applications, libraries, or code which make any use of any
diff --git a/Jupiter/Readable_String_Imp.h b/Jupiter/Readable_String_Imp.h
index 8d25fea..9bc34c9 100644
--- a/Jupiter/Readable_String_Imp.h
+++ b/Jupiter/Readable_String_Imp.h
@@ -1117,27 +1117,48 @@ template<typename T> template<template<typename> class R> R<T> Jupiter::Readable
 
 template<typename T> template<template<typename> class R> R<T> Jupiter::Readable_String<T>::getWord(const T *in, size_t pos, const T *whitespace)
 {
-	unsigned int x = 0;
-	unsigned int y = 1;
-	for (unsigned int i = 0; i < pos || y == 1; x++)
+	if (*in == 0)
+		return R<T>();
+
+	while (Jupiter::strpbrk<T>(whitespace, *in) != nullptr)
+		if (*++in == 0)
+			return R<T>();
+
+	if (pos == 0)
 	{
-		if (in[x] == 0) return R<T>();
-		if (Jupiter::strpbrk<T>(whitespace, in[x]) != nullptr)
-		{
-			if (y != 1)
-			{
-				y = 1;
-				i++;
-			}
-		}
-		else
+		do
+			++in, ++pos;
+		while (*in != 0 && Jupiter::strpbrk<T>(whitespace, *in) == nullptr);
+
+		in -= pos;
+		return R<T>::substring(in, 0, pos);
+	}
+
+	loop_start:
+	{
+		if (Jupiter::strpbrk<T>(whitespace, *in) != nullptr)
 		{
-			if (i >= pos) break;
-			y = 0;
+			do
+				if (*++in == 0)
+					return R<T>();
+			while (Jupiter::strpbrk<T>(whitespace, *in) != nullptr);
+
+			if (--pos == 0)
+				goto loop_end;
 		}
+
+		if (++in == 0)
+			return R<T>();
+		goto loop_start;
 	}
-	for (y = x; in[y] != 0 && Jupiter::strpbrk<T>(whitespace, in[y]) == nullptr; y++);
-	return R<T>::substring(in, x, y - x);
+	loop_end:
+
+	do
+		++in, ++pos;
+	while (*in != 0 && Jupiter::strpbrk<T>(whitespace, *in) == nullptr);
+
+	in -= pos;
+	return R<T>::substring(in, 0, pos);
 }
 
 // getToken
diff --git a/Release/Jupiter.lib b/Release/Jupiter.lib
index e0a547c..f67f652 100644
Binary files a/Release/Jupiter.lib and b/Release/Jupiter.lib differ