diff --git a/src/main/java/redis/clients/jedis/Protocol.java b/src/main/java/redis/clients/jedis/Protocol.java
index 7ae5b2a..5d40492 100644
--- a/src/main/java/redis/clients/jedis/Protocol.java
+++ b/src/main/java/redis/clients/jedis/Protocol.java
@@ -293,6 +293,7 @@ public final class Protocol {
     	PMESSAGE,
     	PSUBSCRIBE,
     	PUNSUBSCRIBE,
+    	OK,
     	ONE,
     	SET,
     	STORE,
diff --git a/src/test/java/redis/clients/jedis/tests/commands/BinaryValuesCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/BinaryValuesCommandsTest.java
new file mode 100644
index 0000000..444a805
--- /dev/null
+++ b/src/test/java/redis/clients/jedis/tests/commands/BinaryValuesCommandsTest.java
@@ -0,0 +1,221 @@
+package redis.clients.jedis.tests.commands;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import redis.clients.jedis.JedisException;
+import redis.clients.jedis.Protocol.Keyword;
+import redis.clients.jedis.tests.JedisTest;
+
+public class BinaryValuesCommandsTest extends JedisCommandTestBase {
+	byte[] bfoo = {0x01, 0x02, 0x03, 0x04};
+	byte[] bbar = {0x05, 0x06, 0x07, 0x08};
+	byte[] binaryValue = null;
+	@Before
+	public void setUp() throws Exception {
+		super.setUp();
+		final InputStream is = this.getClass().getResourceAsStream("/MySimpson.png");
+		byte[] resource = new byte[512];//29542
+		byte[] buffer = new byte[2048];
+		int length = 0;
+		int idx = 0;
+		while(-1 != (length = is.read(buffer))) {
+			if ((idx + length) > resource.length) {
+				byte[] newresource = new byte[resource.length + ((idx + length) - resource.length)];
+				System.arraycopy(resource, 0, newresource, 0, idx);
+				resource = newresource;
+			}
+			System.arraycopy(buffer, 0, resource, idx, length);
+			idx += length;
+		}
+		binaryValue = resource;
+	}
+
+    @Test
+    public void setAndGet() {
+		String status = jedis.set(bfoo, binaryValue);
+		assertTrue(Keyword.OK.name().equalsIgnoreCase(status));
+	
+		byte[] value = jedis.get(bfoo);
+		assertTrue(Arrays.equals(binaryValue, value));
+	
+		assertNull(jedis.get(bbar));
+    }
+
+    @Test
+    public void getSet() {
+		byte[] value = jedis.getSet(bfoo, binaryValue);
+		assertNull(value);
+		value = jedis.get(bfoo);
+		assertTrue(Arrays.equals(binaryValue, value));
+    }
+
+    @Test
+    public void mget() {
+		List<byte[]> values = jedis.mget(bfoo, bbar);
+		List<byte[]> expected = new ArrayList<byte[]>();
+		expected.add(null);
+		expected.add(null);
+		
+		JedisTest.isListAreEquals(expected, values);
+	
+		jedis.set(bfoo, binaryValue);
+	
+		expected = new ArrayList<byte[]>();
+		expected.add(binaryValue);
+		expected.add(null);
+		values = jedis.mget(bfoo, bbar);
+	
+		JedisTest.isListAreEquals(expected, values);
+	
+		jedis.set(bbar, bfoo);
+	
+		expected = new ArrayList<byte[]>();
+		expected.add(binaryValue);
+		expected.add(bfoo);
+		values = jedis.mget(bfoo, bbar);
+	
+		JedisTest.isListAreEquals(expected, values);
+    }
+
+    @Test
+    public void setnx() {
+		int status = jedis.setnx(bfoo, binaryValue);
+		assertEquals(1, status);
+		assertTrue(Arrays.equals(binaryValue, jedis.get(bfoo)));
+	
+		status = jedis.setnx(bfoo, bbar);
+		assertEquals(0, status);
+		assertTrue(Arrays.equals(binaryValue, jedis.get(bfoo)));
+    }
+
+    @Test
+    public void setex() {
+		String status = jedis.setex(bfoo, 20, binaryValue);
+		assertEquals(Keyword.OK.name(), status);
+		int ttl = jedis.ttl(bfoo);
+		assertTrue(ttl > 0 && ttl <= 20);
+    }
+
+    @Test
+    public void mset() {
+		String status = jedis.mset(bfoo, binaryValue, bbar, bfoo);
+		assertEquals(Keyword.OK.name(), status);
+		assertTrue(Arrays.equals(binaryValue, jedis.get(bfoo)));
+		assertTrue(Arrays.equals(bfoo, jedis.get(bbar)));
+    }
+
+    @Test
+    public void msetnx() {
+		int status = jedis.msetnx(bfoo, binaryValue, bbar, bfoo);
+		assertEquals(1, status);
+		assertTrue(Arrays.equals(binaryValue, jedis.get(bfoo)));
+		assertTrue(Arrays.equals(bfoo, jedis.get(bbar)));
+	
+		status = jedis.msetnx(bfoo, bbar, "bar2".getBytes(), "foo2".getBytes());
+		assertEquals(0, status);
+		assertTrue(Arrays.equals(binaryValue, jedis.get(bfoo)));
+		assertTrue(Arrays.equals(bfoo, jedis.get(bbar)));
+    }
+
+    @Test(expected = JedisException.class)
+    public void incrWrongValue() {
+		jedis.set(bfoo, binaryValue);
+		jedis.incr(bfoo);
+    }
+
+    @Test
+    public void incr() {
+		int value = jedis.incr(bfoo);
+		assertEquals(1, value);
+		value = jedis.incr(bfoo);
+		assertEquals(2, value);
+    }
+
+    @Test(expected = JedisException.class)
+    public void incrByWrongValue() {
+		jedis.set(bfoo, binaryValue);
+		jedis.incrBy(bfoo, 2);
+    }
+
+    @Test
+    public void incrBy() {
+		int value = jedis.incrBy(bfoo, 2);
+		assertEquals(2, value);
+		value = jedis.incrBy(bfoo, 2);
+		assertEquals(4, value);
+    }
+
+    @Test(expected = JedisException.class)
+    public void decrWrongValue() {
+		jedis.set(bfoo, binaryValue);
+		jedis.decr(bfoo);
+    }
+
+    @Test
+    public void decr() {
+		int value = jedis.decr(bfoo);
+		assertEquals(-1, value);
+		value = jedis.decr(bfoo);
+		assertEquals(-2, value);
+    }
+
+    @Test(expected = JedisException.class)
+    public void decrByWrongValue() {
+		jedis.set(bfoo, binaryValue);
+		jedis.decrBy(bfoo, 2);
+    }
+
+    @Test
+    public void decrBy() {
+		int value = jedis.decrBy(bfoo, 2);
+		assertEquals(-2, value);
+		value = jedis.decrBy(bfoo, 2);
+		assertEquals(-4, value);
+    }
+
+    @Test
+    public void append() {
+    	byte[] first512 = new byte[512];
+    	System.arraycopy(binaryValue, 0, first512, 0, 512);
+		int value = jedis.append(bfoo, first512);
+		assertEquals(512, value);
+		assertTrue(Arrays.equals(first512, jedis.get(bfoo)));
+		
+		byte[] rest = new byte[binaryValue.length - 512];
+    	System.arraycopy(binaryValue, 512, rest, 0, binaryValue.length - 512);
+		value = jedis.append(bfoo, rest);
+		assertEquals(binaryValue.length, value);
+		
+		assertTrue(Arrays.equals(binaryValue, jedis.get(bfoo)));
+    }
+
+    @Test
+    public void substr() {
+    	jedis.set(bfoo, binaryValue);
+
+    	byte[] first512 = new byte[512];
+    	System.arraycopy(binaryValue, 0, first512, 0, 512);
+    	byte[] rfirst512 = jedis.substr(bfoo, 0, 511);
+		assertTrue(Arrays.equals(first512, rfirst512));
+    	
+    	byte[] last512 = new byte[512];
+    	System.arraycopy(binaryValue, binaryValue.length - 512, last512, 0, 512);
+		assertTrue(Arrays.equals(last512, jedis.substr(bfoo, -512, -1)));
+		
+		assertTrue(Arrays.equals(binaryValue, jedis.substr(bfoo, 0, -1)));
+		
+		assertTrue(Arrays.equals(last512, jedis.substr(bfoo, binaryValue.length - 512, 100000)));
+    }
+
+    @Test
+    public void strlen() {
+		jedis.set(bfoo, binaryValue);
+		assertEquals(binaryValue.length, jedis.strlen(bfoo).intValue());
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/MySimpson.png b/src/test/resources/MySimpson.png
new file mode 100644
index 0000000..025c83d
Binary files /dev/null and b/src/test/resources/MySimpson.png differ