diff --git a/pom.xml b/pom.xml
index d7af862..a0a25ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,8 +127,8 @@
org.hamcrest
- hamcrest-core
- 1.3
+ hamcrest-junit
+ 2.0.0.0
test
diff --git a/src/main/java/si/mazi/rescu/Params.java b/src/main/java/si/mazi/rescu/Params.java
index cb11518..481ab6d 100644
--- a/src/main/java/si/mazi/rescu/Params.java
+++ b/src/main/java/si/mazi/rescu/Params.java
@@ -25,6 +25,7 @@
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.net.URLEncoder;
+import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.regex.Matcher;
@@ -86,12 +87,21 @@ public Params add(String param, Object value) {
private String toQueryString(boolean encode) {
StringBuilder b = new StringBuilder();
- for (String param : data.keySet()) {
- if (isParamSet(param)) {
- if (b.length() > 0) {
- b.append('&');
+ for (String paramName : data.keySet()) {
+ if (isParamSet(paramName)) {
+ Object originalValue = getParamValue(paramName);
+ boolean createArrayParameters = originalValue instanceof Iterable && paramName.endsWith("[]");
+ @SuppressWarnings("unchecked")
+ Iterable