diff --git a/lib/redistat.rb b/lib/redistat.rb
index 23ca423..4ff2389 100644
--- a/lib/redistat.rb
+++ b/lib/redistat.rb
@@ -20,6 +20,7 @@ require 'redistat/mixins/options'
 require 'redistat/mixins/synchronize'
 require 'redistat/mixins/database'
 require 'redistat/mixins/date_helper'
+
 require 'redistat/connection'
 require 'redistat/buffer'
 require 'redistat/collection'
@@ -36,6 +37,7 @@ require 'redistat/version'
 
 require 'redistat/core_ext'
 
+
 module Redistat
   
   KEY_NEXT_ID = ".next_id"
@@ -91,3 +93,9 @@ module Redistat
     
   end
 end
+
+
+# ensure buffer is flushed on program exit
+Kernel.at_exit do
+  Redistat.buffer.flush(true)
+end