diff --git a/Gemfile b/Gemfile
index a1c5e80..7740bcd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,5 +8,6 @@ gem 'fakefs', :require => nil
 gem 'guard'
 gem 'guard-rspec'
 gem 'guard-shell'
+gem 'guard-coffeescript'
 gem 'growl'
 gem 'rake', '0.8.7'
diff --git a/Guardfile b/Guardfile
index 1b2b482..99417c6 100644
--- a/Guardfile
+++ b/Guardfile
@@ -21,3 +21,5 @@ def compile
 end
 
 compile
+
+guard 'coffeescript', :input => 'jasmine'
diff --git a/ext/jasmine-webkit-specrunner/specrunner.cpp b/ext/jasmine-webkit-specrunner/specrunner.cpp
index 7723be7..ff7a00e 100644
--- a/ext/jasmine-webkit-specrunner/specrunner.cpp
+++ b/ext/jasmine-webkit-specrunner/specrunner.cpp
@@ -221,6 +221,8 @@ void HeadlessSpecRunner::log(const QString &msg)
   }
   std::cout << "[console] ";
   clear();
+  if (msg.contains("\n"))
+    std::cout << std::endl;
   std::cout << qPrintable(msg);
   std::cout << std::endl;
 }
diff --git a/lib/jasmine/cli.rb b/lib/jasmine/cli.rb
index 73072da..2612a34 100644
--- a/lib/jasmine/cli.rb
+++ b/lib/jasmine/cli.rb
@@ -36,7 +36,13 @@ module Jasmine
 <head>
   <title>Jasmine Test Runner</title>
   <script type="text/javascript">
-    window.console = { log: function(data) { JHW.log(JSON.stringify(data)); } };
+    window.console = { log: function(data) { 
+      if (jasmine) {
+        JHW.log(jasmine.pp(data))
+      } else {
+        JHW.log(JSON.stringify(data)); 
+      }
+    } };
   </script>
   #{files.join("\n")}
 </head>
