diff --git a/src/main/java/redis/clients/jedis/Client.java b/src/main/java/redis/clients/jedis/Client.java
index 8668367..f85c4e7 100644
--- a/src/main/java/redis/clients/jedis/Client.java
+++ b/src/main/java/redis/clients/jedis/Client.java
@@ -535,4 +535,8 @@ public class Client extends Connection {
     public void info() {
 	sendCommand("INFO");
     }
+
+    public void monitor() {
+	sendCommand("MONITOR");
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/redis/clients/jedis/Connection.java b/src/main/java/redis/clients/jedis/Connection.java
index 3e433c0..dbdab9c 100644
--- a/src/main/java/redis/clients/jedis/Connection.java
+++ b/src/main/java/redis/clients/jedis/Connection.java
@@ -68,12 +68,16 @@ public class Connection {
 	}
     }
 
-    public void disconnect() throws IOException {
+    public void disconnect() {
 	if (connected) {
-	    inputStream.close();
-	    outputStream.close();
-	    if (!socket.isClosed()) {
-		socket.close();
+	    try {
+		inputStream.close();
+		outputStream.close();
+		if (!socket.isClosed()) {
+		    socket.close();
+		}
+	    } catch (IOException ex) {
+		throw new JedisException(ex);
 	    }
 	    connected = false;
 	}
diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java
index 2f37d59..a5a3daf 100644
--- a/src/main/java/redis/clients/jedis/Jedis.java
+++ b/src/main/java/redis/clients/jedis/Jedis.java
@@ -638,4 +638,9 @@ public class Jedis {
 	client.info();
 	return client.getBulkReply();
     }
+
+    public void monitor(JedisMonitor jedisMonitor) {
+	client.monitor();
+	jedisMonitor.proceed(client);
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/redis/clients/jedis/JedisMonitor.java b/src/main/java/redis/clients/jedis/JedisMonitor.java
new file mode 100644
index 0000000..fb99933
--- /dev/null
+++ b/src/main/java/redis/clients/jedis/JedisMonitor.java
@@ -0,0 +1,15 @@
+package redis.clients.jedis;
+
+public abstract class JedisMonitor {
+    protected Client client;
+
+    public void proceed(Client client) {
+	this.client = client;
+	do {
+	    String command = client.getBulkReply();
+	    onCommand(command);
+	} while (client.isConnected());
+    }
+
+    public abstract void onCommand(String command);
+}
\ No newline at end of file
diff --git a/src/test/java/redis/clients/jedis/tests/commands/PersistenceControlCommandsTest.java b/src/test/java/redis/clients/jedis/tests/commands/PersistenceControlCommandsTest.java
index 1946530..aa5c920 100644
--- a/src/test/java/redis/clients/jedis/tests/commands/PersistenceControlCommandsTest.java
+++ b/src/test/java/redis/clients/jedis/tests/commands/PersistenceControlCommandsTest.java
@@ -3,6 +3,7 @@ package redis.clients.jedis.tests.commands;
 import org.junit.Test;
 
 import redis.clients.jedis.JedisException;
+import redis.clients.jedis.JedisMonitor;
 
 public class PersistenceControlCommandsTest extends JedisCommandTestBase {
     @Test
@@ -40,8 +41,18 @@ public class PersistenceControlCommandsTest extends JedisCommandTestBase {
     }
 
     @Test
-    public void info() throws InterruptedException {
+    public void info() {
 	String info = jedis.info();
 	assertNotNull(info);
     }
+
+    @Test
+    public void monitor() {
+	jedis.monitor(new JedisMonitor() {
+	    public void onCommand(String command) {
+		assertTrue(command.contains("OK"));
+		client.disconnect();
+	    }
+	});
+    }
 }
\ No newline at end of file