diff --git a/atom/browser/mac/NSString+ANSI.h b/atom/browser/mac/NSString+ANSI.h
new file mode 100644
index 00000000000..954d9d24432
--- /dev/null
+++ b/atom/browser/mac/NSString+ANSI.h
@@ -0,0 +1,16 @@
+//
+//  NSString+ANSI.h
+//  BitBar
+//
+//  Created by Kent Karlsson on 3/11/16.
+//  Copyright © 2016 Bit Bar. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface NSString (ANSI)
+
+- (BOOL)containsANSICodes;
+- (NSMutableAttributedString*)attributedStringParsingANSICodes;
+
+@end
diff --git a/atom/browser/mac/NSString+ANSI.mm b/atom/browser/mac/NSString+ANSI.mm
new file mode 100644
index 00000000000..4e8f42ce6fd
--- /dev/null
+++ b/atom/browser/mac/NSString+ANSI.mm
@@ -0,0 +1,140 @@
+
+//
+//  NSString+ANSI.m
+//  BitBar
+//
+//  Created by Kent Karlsson on 3/11/16.
+//  Copyright © 2016 Bit Bar. All rights reserved.
+//
+
+#import "Cocoa/Cocoa.h"
+#import "NSString+ANSI.h"
+
+@implementation NSMutableDictionary (ANSI)
+
+- (NSMutableDictionary*)modifyAttributesForANSICodes:(NSString*)codes {
+  BOOL bold = NO;
+  NSFont* font = self[NSFontAttributeName];
+
+  NSArray* codeArray = [codes componentsSeparatedByString:@";"];
+
+  for (NSString* codeString in codeArray) {
+    int code = codeString.intValue;
+    switch (code) {
+      case 0:
+        [self removeAllObjects];
+        // remove italic and bold from font here
+        if (font) self[NSFontAttributeName] = font;
+        break;
+
+      case 1:
+      case 22:
+        bold = (code == 1);
+        break;
+
+    // case 3: italic
+    // case 23: italic off
+    // case 4: underlined
+    // case 24: underlined off
+
+      case 30:
+        self[NSForegroundColorAttributeName] = [NSColor colorWithHexColorString:bold ? @"7f7f7f" : @"000000"];
+        break;
+      case 31:
+        self[NSForegroundColorAttributeName] = [NSColor colorWithHexColorString:bold ? @"cd0000" : @"ff0000"];
+        break;
+      case 32:
+        self[NSForegroundColorAttributeName] = [NSColor colorWithHexColorString:bold ? @"00cd00" : @"00ff00"];
+        break;
+      case 33:
+        self[NSForegroundColorAttributeName] = [NSColor colorWithHexColorString:bold ? @"cdcd00" : @"ffff00"];
+        break;
+      case 34:
+        self[NSForegroundColorAttributeName] = [NSColor colorWithHexColorString:bold ? @"0000ee" : @"5c5cff"];
+        break;
+      case 35:
+        self[NSForegroundColorAttributeName] = [NSColor colorWithHexColorString:bold ? @"cd00cd" : @"ff00ff"];
+        break;
+      case 36:
+        self[NSForegroundColorAttributeName] = [NSColor colorWithHexColorString:bold ? @"00cdcd" : @"00ffff"];
+        break;
+      case 37:
+        self[NSForegroundColorAttributeName] = [NSColor colorWithHexColorString:bold ? @"e5e5e5" : @"ffffff"];
+        break;
+
+      case 39:
+        [self removeObjectForKey:NSForegroundColorAttributeName];
+        break;
+
+      case 40:
+        self[NSBackgroundColorAttributeName] = [NSColor colorWithHexColorString:@"7f7f7f"];
+        break;
+      case 41:
+        self[NSBackgroundColorAttributeName] = [NSColor colorWithHexColorString:@"cd0000"];
+        break;
+      case 42:
+        self[NSBackgroundColorAttributeName] = [NSColor colorWithHexColorString:@"00cd00"];
+        break;
+      case 43:
+        self[NSBackgroundColorAttributeName] = [NSColor colorWithHexColorString:@"cdcd00"];
+        break;
+      case 44:
+        self[NSBackgroundColorAttributeName] = [NSColor colorWithHexColorString:@"0000ee"];
+        break;
+      case 45:
+        self[NSBackgroundColorAttributeName] = [NSColor colorWithHexColorString:@"cd00cd"];
+        break;
+      case 46:
+        self[NSBackgroundColorAttributeName] = [NSColor colorWithHexColorString:@"00cdcd"];
+        break;
+      case 47:
+        self[NSBackgroundColorAttributeName] = [NSColor colorWithHexColorString:@"e5e5e5"];
+        break;
+
+      case 49:
+        [self removeObjectForKey:NSBackgroundColorAttributeName];
+        break;
+
+      default:
+        break;
+    }
+  }
+
+  return self;
+}
+
+@end
+
+@implementation NSString (ANSI)
+
+- (BOOL)containsANSICodes {
+  return [self rangeOfString:@"\033["].location != NSNotFound;
+}
+
+- (NSMutableAttributedString*)attributedStringParsingANSICodes {
+  NSMutableAttributedString* result = [[NSMutableAttributedString alloc] init];
+
+  NSMutableDictionary* attributes = [NSMutableDictionary.alloc init];
+  NSArray* parts = [self componentsSeparatedByString:@"\033["];
+  [result appendAttributedString:[NSAttributedString.alloc initWithString:parts.firstObject attributes:nil]];
+
+  for (NSString* part in [parts subarrayWithRange:NSMakeRange(1, parts.count - 1)]) {
+    if (part.length == 0)
+      continue;
+
+    NSArray* sequence = [part componentsSeparatedByString:@"m"];
+    NSString* text = sequence.lastObject;
+
+    if (sequence.count < 2) {
+      [result appendAttributedString:[NSAttributedString.alloc initWithString:text attributes:attributes]];
+    } else if (sequence.count >= 2) {
+      text = [[sequence subarrayWithRange:NSMakeRange(1, sequence.count - 1)] componentsJoinedByString:@"m"];
+      [attributes modifyAttributesForANSICodes:sequence[0]];
+      [result appendAttributedString:[NSAttributedString.alloc initWithString:text attributes:attributes]];
+    }
+  }
+
+  return result;
+}
+
+@end