diff --git a/auto/colour_reporter.rb b/auto/colour_reporter.rb
index c8084a6..77a357e 100644
--- a/auto/colour_reporter.rb
+++ b/auto/colour_reporter.rb
@@ -16,11 +16,11 @@ def report(message)
           :green
         when /^OK$/
           :green
-        when /FAIL/
+        when /(?:FAIL|ERROR)/
           :red
         when /IGNORE/
           :yellow
-        when /^(Creating|Compiling|Linking)/
+        when /^(?:Creating|Compiling|Linking)/
           :white
         else
           :blue
diff --git a/src/unity.h b/src/unity.h
index 5cac69c..9e0d783 100644
--- a/src/unity.h
+++ b/src/unity.h
@@ -39,6 +39,8 @@
     runTest(func); \
     UnityConcludeTest();
 
+#define TEST_LINE_NUM (Unity.CurrentTestLineNumber)
+
 //-------------------------------------------------------
 // Basic Fail and Ignore
 //-------------------------------------------------------