diff --git a/.gitignore b/.gitignore
index 0c7ecc0..6b6813b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,7 @@ tags*
 # Vendored files
 vendor/**
 !vendor/manifest
+
+# Benchmark files
+prof.cpu
+prof.mem
diff --git a/buffer_test.go b/buffer_test.go
index a6d40d0..6870d21 100644
--- a/buffer_test.go
+++ b/buffer_test.go
@@ -7,6 +7,20 @@ import (
 	"github.com/bmizerany/assert"
 )
 
+func BenchmarkBufferLifecycle(b *testing.B) {
+	buf := Buffer{MaxRecordCount: 1000}
+	seq := "1"
+	rec := &kinesis.Record{SequenceNumber: &seq}
+
+	for i := 0; i < b.N; i++ {
+		buf.AddRecord(rec)
+
+		if buf.ShouldFlush() {
+			buf.Flush()
+		}
+	}
+}
+
 func Test_FirstSeq(t *testing.T) {
 	b := Buffer{}
 	s1, s2 := "1", "2"
@@ -34,7 +48,7 @@ func Test_LastSeq(t *testing.T) {
 }
 
 func Test_ShouldFlush(t *testing.T) {
-	b := Buffer{MaxBatchCount: 2}
+	b := Buffer{MaxRecordCount: 2}
 	s1, s2 := "1", "2"
 	r1 := &kinesis.Record{SequenceNumber: &s1}
 	r2 := &kinesis.Record{SequenceNumber: &s2}