diff --git a/Zutil.jar b/Zutil.jar
index 3c116df..b5f2a06 100755
Binary files a/Zutil.jar and b/Zutil.jar differ
diff --git a/src/zutil/parser/URLDecoder.java b/src/zutil/parser/URLDecoder.java
index 412a00c..853bd47 100755
--- a/src/zutil/parser/URLDecoder.java
+++ b/src/zutil/parser/URLDecoder.java
@@ -1,5 +1,9 @@
 package zutil.parser;
 
+import zutil.converters.Converter;
+
+import java.io.UnsupportedEncodingException;
+
 /**
  * This utility class will decode Strings encoded with % sign's to a normal String
  *
@@ -10,27 +14,40 @@ public class URLDecoder {
     public static String decode(String url){
         if(url == null)
             return null;
-        StringBuilder out = new StringBuilder();
-        for (int i=0; i<url.length(); ++i) {
-            char c = url.charAt(i);
-            switch (c){
-                case '+':
-                    out.append(' ');
-                    break;
-                case '%':
-                    if (i+2 < url.length()) {
-                        char ascii = (char)Integer.parseInt("" + url.charAt(i + 1) + url.charAt(i + 2), 16);
-                        out.append(ascii);
-                        i += 2;
-                    }
-                    else
+
+        try {
+            StringBuilder out = new StringBuilder();
+            byte[] buffer = null;
+            for (int i=0; i<url.length(); ++i) {
+                char c = url.charAt(i);
+                switch (c){
+                    case '+':
+                        out.append(' ');
+                        break;
+                    case '%':
+                        if (i+2 < url.length()) {
+                            if(buffer == null)
+                                buffer = new byte[url.length()];
+                            int bufferPos = 0;
+                            while(i<url.length() && url.charAt(i) == '%') {
+                                buffer[bufferPos++] = Converter.hexToByte(url.charAt(i + 1), url.charAt(i + 2));
+                                i += 3;
+                            }
+                            --i; // Go back one step as i will be incremented in the main for loop
+                            out.append(new String(buffer, 0, bufferPos, "UTF-8"));
+                        }
+                        else
+                            out.append(c);
+                        break;
+                    default:
                         out.append(c);
-                    break;
-                default:
-                    out.append(c);
-                    break;
+                        break;
+                }
             }
+            return out.toString();
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace(); // Should never happen
         }
-        return out.toString();
+        return null;
     }
 }
diff --git a/test/zutil/test/URLDecoderTest.java b/test/zutil/test/URLDecoderTest.java
index f90935c..389ffaf 100755
--- a/test/zutil/test/URLDecoderTest.java
+++ b/test/zutil/test/URLDecoderTest.java
@@ -3,6 +3,8 @@ package zutil.test;
 import org.junit.Test;
 import zutil.parser.URLDecoder;
 
+import java.io.UnsupportedEncodingException;
+
 import static org.junit.Assert.assertEquals;
 
 
@@ -29,7 +31,8 @@ public class URLDecoderTest {
     }
 
     @Test
-    public void percentMultibyteTest(){
+    public void percentMultibyteTest() throws UnsupportedEncodingException {
+        assertEquals("Ängen", java.net.URLDecoder.decode("%C3%84ngen", "UTF-8"));
         assertEquals("Ängen", URLDecoder.decode("%C3%84ngen"));
     }
 }