diff --git a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/table/implementation/DefaultEdmValueConterter.java b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/table/implementation/DefaultEdmValueConterter.java
index f7df91f533f51..41b38735afa51 100644
--- a/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/table/implementation/DefaultEdmValueConterter.java
+++ b/microsoft-azure-api/src/main/java/com/microsoft/windowsazure/services/table/implementation/DefaultEdmValueConterter.java
@@ -22,6 +22,7 @@
 import com.microsoft.windowsazure.services.blob.implementation.ISO8601DateConverter;
 import com.microsoft.windowsazure.services.table.EdmValueConverter;
 import com.microsoft.windowsazure.services.table.models.EdmType;
+import com.sun.jersey.core.util.Base64;
 
 public class DefaultEdmValueConterter implements EdmValueConverter {
 
@@ -41,6 +42,9 @@ public String serialize(String edmType, Object value) {
         if (value instanceof Date) {
             serializedValue = iso8601DateConverter.shortFormat((Date) value);
         }
+        else if (value instanceof byte[]) {
+            serializedValue = new String(Base64.encode((byte[]) value));
+        }
         else {
             serializedValue = value.toString();
         }
@@ -73,6 +77,9 @@ else if (EdmType.INT32.equals(edmType)) {
         else if (EdmType.INT64.equals(edmType)) {
             return Long.parseLong(value);
         }
+        else if (EdmType.BINARY.equals(edmType)) {
+            return Base64.decode(value);
+        }
 
         return value;
     }