diff --git a/datastructures-csv/src/main/java/org/xbib/datastructures/csv/Constants.java b/datastructures-csv/src/main/java/org/xbib/datastructures/csv/Constants.java
index 32875cd..73e7263 100644
--- a/datastructures-csv/src/main/java/org/xbib/datastructures/csv/Constants.java
+++ b/datastructures-csv/src/main/java/org/xbib/datastructures/csv/Constants.java
@@ -8,6 +8,5 @@ public interface Constants {
     char LF = '\n';
     char TAB = '\t';
     char COMMA = ',';
-    char QUOTE = '\"';
-    char ESCAPE_CHARACTER = '\"';
+    char DOUBLE_QUOTE = '\"';
 }
diff --git a/datastructures-csv/src/main/java/org/xbib/datastructures/csv/Generator.java b/datastructures-csv/src/main/java/org/xbib/datastructures/csv/Generator.java
index f9df05f..d3b4f2c 100644
--- a/datastructures-csv/src/main/java/org/xbib/datastructures/csv/Generator.java
+++ b/datastructures-csv/src/main/java/org/xbib/datastructures/csv/Generator.java
@@ -19,12 +19,33 @@ public class Generator implements Constants, Closeable, Flushable {
 
     private List<String> keys;
 
+    private char separator = COMMA;
+
+    private char quote = DOUBLE_QUOTE;
+
+    private boolean alwaysQuote;
+
     public Generator(Writer writer) {
         this.writer = writer;
         this.col = 0;
         this.keys = new ArrayList<>();
     }
 
+    public Generator setSeparator(char separator) {
+        this.separator = separator;
+        return this;
+    }
+
+    public Generator setAlwaysQuote(boolean alwaysQuote) {
+        this.alwaysQuote = alwaysQuote;
+        return this;
+    }
+
+    public Generator setQuote(char quote) {
+        this.quote = quote;
+        return this;
+    }
+
     public Generator keys(List<String> keys) {
         this.keys = keys;
         return this;
@@ -44,7 +65,7 @@ public class Generator implements Constants, Closeable, Flushable {
             col = 0;
         } else {
             if (col > 0) {
-                writer.write(COMMA);
+                writer.write(separator);
             }
         }
         if (value != null) {
@@ -72,8 +93,7 @@ public class Generator implements Constants, Closeable, Flushable {
     }
 
     private String escape(String value) {
-        if (value.indexOf(QUOTE) < 0
-                && value.indexOf(ESCAPE_CHARACTER) < 0
+        if (!alwaysQuote && value.indexOf(quote) < 0
                 && value.indexOf(COMMA) < 0
                 && value.indexOf(TAB) < 0
                 && !value.contains(LF)) {
@@ -81,15 +101,15 @@ public class Generator implements Constants, Closeable, Flushable {
         }
         int length = value.length();
         StringBuilder sb = new StringBuilder(length + 2);
-        sb.append(QUOTE);
+        sb.append(quote);
         for (int i = 0; i < length; i++) {
             char ch = value.charAt(i);
-            if (ch == QUOTE) {
-                sb.append(QUOTE);
+            if (ch == quote) {
+                sb.append(quote);
             }
             sb.append(ch);
         }
-        sb.append(QUOTE);
+        sb.append(quote);
         return sb.toString();
     }
 
diff --git a/datastructures-csv/src/test/java/org/xbib/datastructures/csv/test/GeneratorTest.java b/datastructures-csv/src/test/java/org/xbib/datastructures/csv/test/GeneratorTest.java
index 2dd3894..948c655 100644
--- a/datastructures-csv/src/test/java/org/xbib/datastructures/csv/test/GeneratorTest.java
+++ b/datastructures-csv/src/test/java/org/xbib/datastructures/csv/test/GeneratorTest.java
@@ -47,4 +47,19 @@ public class GeneratorTest {
         gen.close();
         assertEquals("val0,\"\"\"Hello, World\"\"\",\"hey look a line seperator \n\"", writer.toString());
     }
+
+    @Test
+    public void testSemicolonAlwaysQuote() throws IOException {
+        StringWriter writer = new StringWriter();
+        Generator gen = new Generator(writer).setAlwaysQuote(true).setSeparator(';');
+        gen.keys(Arrays.asList("a", "b", "c"));
+        for (int i = 0; i < 1; i++) {
+            gen.write("val" + i);
+            gen.write("\"Hello, World\"");
+            gen.write("hey look a line seperator \n");
+        }
+        gen.close();
+        assertEquals("\"val0\";\"\"\"Hello, World\"\"\";\"hey look a line seperator \n\"", writer.toString());
+    }
 }
+