diff --git a/lib/more.rb b/lib/more.rb
index b6bd0ef..26e2e63 100644
--- a/lib/more.rb
+++ b/lib/more.rb
@@ -48,9 +48,8 @@ def page_cache?
     # .less file should be edited instead.
     #
     #    Less::More.header = false
-    def header
-      result = get_cvar(:header)
-      get_cvar(:header) ? DEFAULT_HEADER : ""
+    def header?
+      get_cvar(:header)
     end
     
     # The path, or route, where you want your .css files to live.
@@ -111,6 +110,8 @@ def generate(path_as_array)
       engine = File.open(source) {|f| Less::Engine.new(f) }
       css = engine.to_css
       css.delete!("\n") if self.compression?
+      css = (HEADER % [source.to_s]) << css if self.header?
+      
       css
     end
     
diff --git a/test/more_test.rb b/test/more_test.rb
index c62af8e..5951598 100644
--- a/test/more_test.rb
+++ b/test/more_test.rb
@@ -69,7 +69,17 @@ def test_generate
     Less::More.source_path = File.join(File.dirname(__FILE__), 'less_files')
     Less::More.compression = true
     
-    assert_equal ".allforms { font-size: 110%; }body { color: #222222; }form {  font-size: 110%;  color: #ffffff;}", Less::More.generate(["test"])
+    assert Less::More.generate(["test"]).include?(".allforms { font-size: 110%; }body { color: #222222; }form {  font-size: 110%;  color: #ffffff;}")
+  end
+  
+  def test_header
+    Less::More.expects(:header?).returns(false)
+    Less::More.source_path = File.join(File.dirname(__FILE__), 'less_files')
+    assert !Less::More.generate(["test"]).starts_with?("/*")
+    
+    Less::More.expects(:header?).returns(true)
+    Less::More.source_path = File.join(File.dirname(__FILE__), 'less_files')
+    assert Less::More.generate(["test"]).starts_with?("/*")
   end
   
   def test_pathname_from_array