diff --git a/src/MemoryOutStream.cpp b/src/MemoryOutStream.cpp
index 3bacb45..8b97132 100644
--- a/src/MemoryOutStream.cpp
+++ b/src/MemoryOutStream.cpp
@@ -32,8 +32,9 @@ void FormatToStream(MemoryOutStream& stream, char const* format, ValueType const
 {
 	using namespace std;
 
-    char txt[32];
-    sprintf(txt, format, value);
+    const size_t BUFFER_SIZE=32;
+    char txt[BUFFER_SIZE];
+    snprintf(txt, BUFFER_SIZE, format, value);
     stream << txt;
 }
 
@@ -127,7 +128,7 @@ MemoryOutStream& MemoryOutStream::operator <<(unsigned long long const n)
 
 MemoryOutStream& MemoryOutStream::operator <<(float const f)
 {
-    FormatToStream(*this, "%ff", f);
+    FormatToStream(*this, "%0.6f", f);
     return *this;    
 }
 
@@ -145,7 +146,7 @@ MemoryOutStream& MemoryOutStream::operator <<(unsigned int const s)
 
 MemoryOutStream& MemoryOutStream::operator <<(double const d)
 {
-	FormatToStream(*this, "%f", d);
+	FormatToStream(*this, "%0.6f", d);
 	return *this;
 }
 
diff --git a/src/tests/TestMemoryOutStream.cpp b/src/tests/TestMemoryOutStream.cpp
index 87d19c5..964f149 100644
--- a/src/tests/TestMemoryOutStream.cpp
+++ b/src/tests/TestMemoryOutStream.cpp
@@ -4,6 +4,7 @@
 #include <cstring>
 #include <climits>
 #include <cstdlib>
+#include <cfloat>
 
 using namespace UnitTest;
 using namespace std;
@@ -152,15 +153,15 @@ TEST(WritingStringLongerThanCapacityFitsInNewBuffer)
 TEST(WritingIntLongerThanCapacityFitsInNewBuffer)
 {
     MemoryOutStream stream(8);
-    stream << "aaaa" << 123456;;
+    stream << "aaaa" << 123456;
     CHECK_EQUAL("aaaa123456", stream.GetText());
 }
 
 TEST(WritingFloatLongerThanCapacityFitsInNewBuffer)
 {
     MemoryOutStream stream(8);
-    stream << "aaaa" << 123456.0f;;
-    CHECK_EQUAL("aaaa123456.000000f", stream.GetText());
+    stream << "aaaa" << 123456.0f;
+    CHECK_EQUAL("aaaa123456.000000", stream.GetText());
 }
 
 TEST(WritingSizeTLongerThanCapacityFitsInNewBuffer)
@@ -170,6 +171,13 @@ TEST(WritingSizeTLongerThanCapacityFitsInNewBuffer)
     CHECK_EQUAL("aaaa32145", stream.GetText());
 }
 
+TEST(VerifyLargeDoubleCanBeStreamedWithoutCrashing)
+{
+    MemoryOutStream stream(8);
+    stream << DBL_MAX;
+    CHECK(true);
+}
+
 #endif
 
 }