diff --git a/README.md b/README.md
index 18de4b7..9f676c9 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,9 @@ Todo
 
 Changelog
 ---------
+####0.2.1
+- Renamed some functions
+- Pulled decoding of URL encoded objects into own function
 ####0.2.0
 - Interface to decode QueryStrings
 - Interface to create HttpUrl from string
diff --git a/bower.json b/bower.json
index ea0d27f..41bbdbe 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "Typertext",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "homepage": "https://github.com/terribleplan/Typertext",
   "authors": [
     "Kegan Myers <kegan@keganmyers.com>"
diff --git a/lib/Typertext/Http/HttpUrl.ts b/lib/Typertext/Http/HttpUrl.ts
index 01dbf18..2200296 100644
--- a/lib/Typertext/Http/HttpUrl.ts
+++ b/lib/Typertext/Http/HttpUrl.ts
@@ -19,16 +19,31 @@ module Typertext.Http {
         }
 
         public static DecodeQueryString(queryString:string):HttpQueryString {
-            var returnValue:HttpQueryString = {};
             if (queryString.length == 0 || queryString == "?") {
-                return returnValue;
+                return {};
             }
 
-            if (queryString.indexOf("?") == 0) {
-                queryString = queryString.substring(1);
+            return HttpUrl.UrlDecodeString(queryString);
+        }
+
+        public static EncodeQueryString(query:HttpQueryString) {
+            var rs = "?" + HttpUrl.UrlEncodeObject(query);
+            return ((rs.length == 1) ? "" : rs);
+        }
+
+        public static UrlEncodeObject(data:HttpQueryString):string {
+            var rs:string = "";
+            var temp:string;
+
+            for (temp in data) {
+                rs += +encodeURIComponent(temp) + "=" + encodeURIComponent(data[temp]) + "&";
             }
 
-            var params:string[] = HttpUrl.splitString(queryString, "&");
+            return rs.slice(0, -1);
+        }
+
+        public static UrlDecodeString(queryString:string):HttpQueryString {
+            var returnValue:HttpQueryString = {}, params:string[] = HttpUrl.splitString(queryString, "&");
             for (var i:number = 0; i < params.length; i++) {
                 var param = HttpUrl.splitString(params[i], "=", 2);
                 if (param.length == 1) {
@@ -42,24 +57,6 @@ module Typertext.Http {
             return returnValue;
         }
 
-        public static EncodeQueryString(query:HttpQueryString) {
-            var rs = "?" + HttpUrl.URLEncodeObject(query);
-            return ((rs.length == 1) ? "" : rs);
-        }
-
-        public static URLEncodeObject(data:{
-            [index:string]:string
-        }):string {
-            var rs:string = "";
-            var temp:string;
-
-            for (temp in data) {
-                rs += +encodeURIComponent(temp) + "=" + encodeURIComponent(data[temp]) + "&";
-            }
-
-            return rs.slice(0, -1);
-        }
-
         private static splitString(input:string, separator:string, limit:number = 0):string[] {
             limit++;
             var chunks:string[] = input.split(separator);
@@ -71,9 +68,7 @@ module Typertext.Http {
             return chunks;
         }
 
-        constructor(domain:string, protocol:HttpProtocol = HttpProtocol.http, path:string = "/", queryString:{
-            [index:string]:string
-        } = {}, port:number = 0) {
+        constructor(domain:string, protocol:HttpProtocol = HttpProtocol.http, path:string = "/", queryString:HttpQueryString = {}, port:number = 0) {
             if (port < 1 || port > 65535) {
                 port = HttpUrl.DefaultPort(protocol);
             }
diff --git a/package.json b/package.json
index 89b268e..4f97c1f 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
         "type" : "git",
         "url" : "https://github.com/terribleplan/Typertext.git"
     },
-    "version": "0.2.0",
+    "version": "0.2.1",
     "devDependencies": {
         "grunt": "~0.4.2",
         "grunt-typescript": "~0.2.7"