diff --git a/JsonGenerator/JsonValue.cpp b/JsonGenerator/JsonValue.cpp
index 5839d005..1f983897 100644
--- a/JsonGenerator/JsonValue.cpp
+++ b/JsonGenerator/JsonValue.cpp
@@ -12,7 +12,7 @@ size_t JsonValue::printBoolTo(Print& p) const
 
 size_t JsonValue::printDoubleTo(Print& p) const
 {
-    return p.print(content.asDouble);
+    return p.print(content.asDouble.value, content.asDouble.digits);
 }
 
 size_t JsonValue::printFloatTo(Print& p) const
diff --git a/JsonGenerator/JsonValue.h b/JsonGenerator/JsonValue.h
index 356d9974..f1b0d80e 100644
--- a/JsonGenerator/JsonValue.h
+++ b/JsonGenerator/JsonValue.h
@@ -22,10 +22,11 @@ public:
         content.asBool = value;
     }
 
-    JsonValue(double value)
+    JsonValue(double value, int digits=2)
         : implementation(&JsonValue::printDoubleTo)
     {
-        content.asDouble = value;
+        content.asDouble.value = value;
+        content.asDouble.digits = digits;
     }
 
     JsonValue(float value)
@@ -69,11 +70,15 @@ private:
     union Content
     {
         bool        asBool;
-        double      asDouble;
         float       asFloat;
         long        asLong;
         Printable*  asPrintable;
         const char* asString;
+        
+        struct {
+            double value;
+            int digits;
+        } asDouble;
     };
 
     Content content;
diff --git a/JsonGeneratorTests/JsonValueTests.cpp b/JsonGeneratorTests/JsonValueTests.cpp
index 2d522e9e..fa0b185d 100644
--- a/JsonGeneratorTests/JsonValueTests.cpp
+++ b/JsonGeneratorTests/JsonValueTests.cpp
@@ -16,107 +16,102 @@ namespace JsonGeneratorTests
         TEST_METHOD(Null)
         {
             write((char*)0);
-
-            assertReturns(4);
             assertResultIs("null");
         }
 
         TEST_METHOD(EmptyString)
         {
             write("");
-
-            assertReturns(2);
             assertResultIs("\"\"");
         }
 
         TEST_METHOD(QuotationMark)
         {
             write("\"");
-            assertReturns(4);
             assertResultIs("\"\\\"\"");
         }
 
         TEST_METHOD(ReverseSolidus)
         {
             write("\\");
-            assertReturns(4);
             assertResultIs("\"\\\\\"");
         }
 
         TEST_METHOD(Solidus)
         {
             write("/");
-            assertReturns(3);
             assertResultIs("\"/\""); // but the JSON format allows \/
         }
 
         TEST_METHOD(Backspace)
         {
             write("\b");
-            assertReturns(4);
             assertResultIs("\"\\b\"");
         }
 
         TEST_METHOD(Formfeed)
         {
             write("\f");
-            assertReturns(4);
             assertResultIs("\"\\f\"");
         }
 
         TEST_METHOD(Newline)
         {
             write("\n");
-            assertReturns(4);
             assertResultIs("\"\\n\"");
         }
 
         TEST_METHOD(CarriageReturn)
         {
             write("\r");
-            assertReturns(4);
             assertResultIs("\"\\r\"");
         }    
 
         TEST_METHOD(HorizontalTab)
         {
             write("\t");
-            assertReturns(4);
             assertResultIs("\"\\t\"");
         }
 
-        TEST_METHOD(Float)
+        TEST_METHOD(DoubleDefaultDigits)
         {
-            write(3.40282346e38F);
-           // assertReturns(4);
-            assertResultIs("3.40282347e+038");
+            write(3.14159265358979323846);
+            assertResultIs("3.14");
         }
 
-        TEST_METHOD(Double)
+        TEST_METHOD(DoubleZeroDigits)
         {
-            write(1.7976931348623157e308);
-            // assertReturns(4);
-            assertResultIs("1.7976931348623157e+308");
+            write(3.14159265358979323846, 0);
+            assertResultIs("3");
+        }
+
+        TEST_METHOD(DoubleOneDigit)
+        {
+            write(3.14159265358979323846, 1);
+            assertResultIs("3.1");
+        }
+
+        TEST_METHOD(DoubleTwoDigits)
+        {
+            write(3.14159265358979323846, 2);
+            assertResultIs("3.14");
         }
 
         TEST_METHOD(Integer)
         {
             write(314);
-            assertReturns(3);
             assertResultIs("314");
         }
 
         TEST_METHOD(Short)
         {
             write((short)314);
-            assertReturns(3);
             assertResultIs("314");
         }
 
         TEST_METHOD(Long)
         {
             write(314L);
-            assertReturns(3);
             assertResultIs("314");
         }
 
@@ -127,14 +122,16 @@ namespace JsonGeneratorTests
             returnValue = JsonValue(value).printTo(sb);
         }
 
+        void write(double value, int digits)
+        {
+            StringBuilder sb(buffer, sizeof(buffer));
+            returnValue = JsonValue(value, digits).printTo(sb);
+        }
+
         void assertResultIs(const char* expected)
         {
             Assert::AreEqual(expected, buffer);
-        }
-
-        void assertReturns(size_t expected)
-        {
-            Assert::AreEqual(expected, returnValue);
+            Assert::AreEqual(strlen(expected), returnValue);
         }
     };
 }
\ No newline at end of file
diff --git a/JsonGeneratorTests/Print.cpp b/JsonGeneratorTests/Print.cpp
index ba70a0d4..ad56c340 100644
--- a/JsonGeneratorTests/Print.cpp
+++ b/JsonGeneratorTests/Print.cpp
@@ -22,7 +22,7 @@ size_t Print::write(const char* s)
 size_t Print::print(double value, int digits)
 {
     char tmp[32];
-    sprintf(tmp, "%.*lg", digits, value);
+    sprintf(tmp, "%.*lg", digits+1, value);
     return write(tmp);
 }