diff --git a/Source/SocketPacket.swift b/Source/SocketPacket.swift
index 19eaf74..43e0f3d 100644
--- a/Source/SocketPacket.swift
+++ b/Source/SocketPacket.swift
@@ -106,7 +106,7 @@ struct SocketPacket {
                         type: SocketPacket.logType)
                 }
             } else if let str = arg as? String {
-                restOfMessage += "\"" + ((str["\n"] <~ "\\\\n")["\r"] <~ "\\\\r") + "\","
+                restOfMessage += "\"" + (((str["\n"] <~ "\\\\n")["\r"] <~ "\\\\r")["\""] <~ "\\\\\"") + "\","
             } else if arg is NSNull {
                 restOfMessage += "null,"
             } else {
diff --git a/Source/SwiftRegex.swift b/Source/SwiftRegex.swift
index 1a8bfd9..efe47d9 100644
--- a/Source/SwiftRegex.swift
+++ b/Source/SwiftRegex.swift
@@ -19,7 +19,7 @@ private let lock = dispatch_semaphore_create(1)
 private var swiftRegexCache = [String: NSRegularExpression]()
 
 internal final class SwiftRegex: NSObject, BooleanType {
-    var target:String
+    var target: String
     var regex: NSRegularExpression
     
     init(target:String, pattern:String, options:NSRegularExpressionOptions?) {