diff -r 0d0a2e46c7a5209fadb3cbd9a9775a469fb184a9 -r 1b7e886a1b5d26a5e66b01e68397e3ca9acf5e06 include/csvpp.h
--- a/include/csvpp.h	Sun Aug 11 18:11:22 2013 -0500
+++ b/include/csvpp.h	Sat Oct 12 20:44:44 2013 -0500
@@ -8,7 +8,7 @@
 #include <istream>
 
 
-#define VERSION "2.0"
+#define VERSION "2.1"
 
 namespace csvpp {
 
diff -r 0d0a2e46c7a5209fadb3cbd9a9775a469fb184a9 -r 1b7e886a1b5d26a5e66b01e68397e3ca9acf5e06 src/csvpp.cpp
--- a/src/csvpp.cpp	Sun Aug 11 18:11:22 2013 -0500
+++ b/src/csvpp.cpp	Sat Oct 12 20:44:44 2013 -0500
@@ -48,6 +48,12 @@
 		stringstream buffer2;
 		int currentheader = 0;
 		getline(is, buffer);
+		// Patch by damienlmoore - https://code.google.com/p/csvpp/issues/detail?id=1
+		if(!is.good() || is.eof())
+		{
+			return is;
+		}
+		
 		buffer = trim_copy(buffer);
 		char c;
 		bool startquote = false;