diff --git a/s3select b/s3select
index ed6ee17..abd81f7 100755
--- a/s3select
+++ b/s3select
@@ -67,14 +67,18 @@ class S3ListThread(threading.Thread):
 class ScanOneKey(threading.Thread):
     def __init__(
             self, files_queue, events_queue, s3, output_fields=None, count=None,
-            field_delimiter=None, record_delimiter=None, where=None, limit=None,
-            max_retries=None):
+            field_delimiter=None, record_delimiter=None, quote_character=None,
+            quote_escape_character=None, allow_quoted_record_delimiter=False,
+            where=None, limit=None, max_retries=None):
         threading.Thread.__init__(self)
         self.max_retries = max_retries
         self.limit = limit
         self.where = where
         self.field_delimiter = field_delimiter
         self.record_delimiter = record_delimiter
+        self.quote_character = quote_character
+        self.quote_escape_character = quote_escape_character
+        self.allow_quoted_record_delimiter = allow_quoted_record_delimiter
         self.count = count
         self.output_fields = output_fields
         self.files_queue = files_queue
@@ -101,13 +105,21 @@ class ScanOneKey(threading.Thread):
                 return
             input_ser = {'JSON': {"Type": "Document"}}
             output_ser = {'JSON': {}}
-            if self.field_delimiter is not None or \
-                    self.record_delimiter is not None:
-
+            if (
+                self.field_delimiter is not None or
+                self.record_delimiter is not None or
+                self.quote_character is not None or
+                self.quote_escape_character is not None or
+                self.allow_quoted_record_delimiter
+            ):
                 if self.field_delimiter is None:
-                    self.field_delimiter = "\n"
+                    self.field_delimiter = ","
                 if self.record_delimiter is None:
-                    self.record_delimiter = ","
+                    self.record_delimiter = "\n"
+                if self.quote_character is None:
+                    self.quote_character = "\""
+                if self.quote_escape_character is None:
+                    self.quote_escape_character = "\\"
 
                 input_ser = {
                     'CSV':
@@ -115,7 +127,9 @@ class ScanOneKey(threading.Thread):
                             "FieldDelimiter": self.field_delimiter,
                             "FileHeaderInfo": "NONE",
                             "RecordDelimiter": self.record_delimiter,
-                            "QuoteCharacter": ''
+                            "QuoteCharacter": self.quote_character,
+                            "QuoteEscapeCharacter": self.quote_escape_character,
+                            "AllowQuotedRecordDelimiter": self.allow_quoted_record_delimiter,
                         }
                 }
                 output_ser = {'CSV': {"FieldDelimiter": self.field_delimiter}}
@@ -238,7 +252,8 @@ def refresh_status_bar(
 
 def select(prefixes=None, verbose=False, profile=None, thread_count=150,
            count=False, limit=0, output_fields=None, field_delimiter=None,
-           record_delimiter=None, where=None, max_retries=20,
+           record_delimiter=None, quote_character=None, quote_escape_character=None,
+           allow_quoted_record_delimiter=False, where=None, max_retries=20,
            with_filename=False):
     if prefixes is None:
         raise Exception("S3 path prefix must be defined")
@@ -266,8 +281,10 @@ def select(prefixes=None, verbose=False, profile=None, thread_count=150,
             thread = ScanOneKey(
                 files_queue, events_queue, s3, count=count, limit=limit,
                 output_fields=output_fields, field_delimiter=field_delimiter,
-                record_delimiter=record_delimiter, where=where,
-                max_retries=max_retries)
+                record_delimiter=record_delimiter, quote_character=quote_character,
+                quote_escape_character=quote_escape_character,
+                allow_quoted_record_delimiter=allow_quoted_record_delimiter,
+                where=where, max_retries=max_retries)
 
         # daemon threads allow for fast exit if max number of records has been
         # specified
@@ -370,13 +387,32 @@ if __name__ == "__main__":
         "-d",
         "--field_delimiter",
         help="Field delimiter to be used for CSV files. If specified CSV "
-             "parsing will be used. By default we expect JSON input"
+             "parsing will be used. By default we expect JSON input."
     )
     parser.add_argument(
         "-D",
         "--record_delimiter",
         help="Record delimiter to be used for CSV files. If specified CSV "
-             "parsing will be used. By default we expect JSON input"
+             "parsing will be used. By default we expect JSON input."
+    )
+    parser.add_argument(
+        "-q",
+        "--quote_character",
+        help="Quote character to be used for CSV files. If specified CSV "
+             "parsing will be used. By default we expect JSON input."
+    )
+    parser.add_argument(
+        "-Q",
+        "--quote_escape_character",
+        help="Quote escape character to be used for CSV files. If specified "
+             "CSV parsing will be used. By default we expect JSON input."
+    )
+    parser.add_argument(
+        "-A",
+        "--allow_quoted_record_delimiter",
+        action='store_true',
+        help="Allow record delimiter to be quoted in CSV files. If specified "
+             "CSV parsing will be used. By default we expect JSON input."
     )
     parser.add_argument(
         "-l",