diff --git a/src/main/java/at/compax/tools/sql/main/Main.java b/src/main/java/at/compax/tools/sql/main/Main.java
index 4bfbc20..63aca4f 100644
--- a/src/main/java/at/compax/tools/sql/main/Main.java
+++ b/src/main/java/at/compax/tools/sql/main/Main.java
@@ -19,6 +19,7 @@ import at.compax.tools.sql.ConnectionParameters;
 import at.compax.tools.sql.FrogConnection;
 import at.compax.tools.sql.SqlExecutionException;
 import at.compax.tools.sql.SqlExecutor;
+import at.compax.tools.sql.model.QueryParameter;
 import at.compax.tools.sql.model.QueryResult;
 import at.compax.tools.sql.model.Result;
 import at.compax.tools.sql.model.UserError;
@@ -185,10 +186,13 @@ public class Main {
           if (!"--- END ---".equals(line)) {
             commandBuffer.append(line).append("\n");
           } else {
-            String query = commandBuffer.toString().trim();
+            ObjectMapper mapper = new ObjectMapper();
+            QueryParameter queryParameter = mapper.readValue(commandBuffer.toString(), QueryParameter.class);
+            
+            String query = queryParameter.getSql();
             String result;
             if (query.toLowerCase().startsWith("select")) {
-              result = formatJsonObject(SqlExecutor.executeQuery(conn, query, null));
+              result = formatJsonObject(SqlExecutor.executeQuery(conn, query, queryParameter.getRowLimit()));
             } else if (query.toLowerCase().startsWith("update") || query.toLowerCase().startsWith("insert")) {
               result = formatJsonObject(SqlExecutor.executeUpdate(conn, query));
             } else {
diff --git a/src/main/java/at/compax/tools/sql/model/QueryParameter.java b/src/main/java/at/compax/tools/sql/model/QueryParameter.java
index 6c8e106..e8bc9c2 100644
--- a/src/main/java/at/compax/tools/sql/model/QueryParameter.java
+++ b/src/main/java/at/compax/tools/sql/model/QueryParameter.java
@@ -14,5 +14,6 @@ import lombok.ToString;
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class QueryParameter {
   private String sql;
+  private Long rowLimit;
   private List<Object> parameters;
 }