diff --git a/library.properties b/library.properties
index 32ba8f4c..90973ad6 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=ArduinoSTL
-version=0.1.5
+version=0.1.6
 author=Mike Matera <matera@lifealgorithmic.com>
 maintainer=Mike Matera <matera@lifealgorithmic.com>
 sentence=A port of uClibc++ packaged as an Arduino library.
diff --git a/src/istream_helpers b/src/istream_helpers
index 1dbfad98..baa8c2ce 100644
--- a/src/istream_helpers
+++ b/src/istream_helpers
@@ -324,9 +324,9 @@ namespace std{
 			}
 			unsigned int dec = temp.find('.', 0);
 			if (dec == string::npos) {
-			  var = atoi(temp.c_str());
+			  var = atol(temp.c_str());
 			}else{
-			  var = atoi(temp.substr(0,dec).c_str());
+			  var = atol(temp.substr(0,dec).c_str());
 			  var += ((double) atoi(temp.substr(dec+1).c_str())) / pow(10.0,temp.size()-dec-1);
 			}
 			if (isneg)
@@ -351,9 +351,9 @@ namespace std{
 			}
 			unsigned int dec = temp.find('.', 0);
 			if (dec == string::npos) {
-			  var = atoi(temp.c_str());
+			  var = atol(temp.c_str());
 			}else{
-			  var = atoi(temp.substr(0,dec).c_str());
+			  var = atol(temp.substr(0,dec).c_str());
 			  var += ((double) atoi(temp.substr(dec+1).c_str())) / pow(10.0,temp.size()-dec-1);
 			}
 			if (isneg)