diff --git a/examples/src/main/scala/spark/streaming/examples/ZeroMQWordCount.scala b/examples/src/main/scala/spark/streaming/examples/ZeroMQWordCount.scala
index ab7b67ed4b55ff48234495f7859dde3de62574f9..5ed9b7cb768750e5e140802bdeca782fae134847 100644
--- a/examples/src/main/scala/spark/streaming/examples/ZeroMQWordCount.scala
+++ b/examples/src/main/scala/spark/streaming/examples/ZeroMQWordCount.scala
@@ -35,20 +35,23 @@ object SimpleZeroMQPublisher {
 /**
  * A sample wordcount with ZeroMQStream stream
  *
- * Usage: WordCountZeroMQ <master> <zeroMQurl> <topic>
+ * To work with zeroMQ, some native libraries have to be installed.
+ * Install zeroMQ (release 2.1) core libraries. [ZeroMQ Install guide](http://www.zeromq.org/intro:get-the-software)
+ * 
+ * Usage: ZeroMQWordCount <master> <zeroMQurl> <topic>
  * In local mode, <master> should be 'local[n]' with n > 1
  *   <zeroMQurl> and <topic> describe where zeroMq publisher is running.
  *
  * To run this example locally, you may run publisher as
  *    `$ ./run spark.streaming.examples.SimpleZeroMQPublisher tcp://127.0.1.1:1234 foo.bar`
- * and then run the example
+ * and run the example as
  *    `$ ./run spark.streaming.examples.ZeroMQWordCount local[2] tcp://127.0.1.1:1234 foo`
  */
 object ZeroMQWordCount {
   def main(args: Array[String]) {
     if (args.length < 3) {
       System.err.println(
-        "Usage: WordCountZeroMQ <master> <zeroMQurl> <topic>" +
+        "Usage: ZeroMQWordCount <master> <zeroMQurl> <topic>" +
           "In local mode, <master> should be 'local[n]' with n > 1")
       System.exit(1)
     }
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 5fe85a28c3cf7b003a00035e6e600ebbf75c190e..7f432b60dbc1aa359e22879f39a4fc67d76c7e4e 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -134,7 +134,6 @@ object SparkBuild extends Build {
       "com.typesafe.akka" % "akka-actor" % "2.0.3",
       "com.typesafe.akka" % "akka-remote" % "2.0.3",
       "com.typesafe.akka" % "akka-slf4j" % "2.0.3",
-      "com.typesafe.akka" % "akka-zeromq" % "2.0.3",
       "it.unimi.dsi" % "fastutil" % "6.4.4",
       "colt" % "colt" % "1.2.0",
       "cc.spray" % "spray-can" % "1.0-M2.1",
@@ -165,7 +164,8 @@ object SparkBuild extends Build {
     libraryDependencies ++= Seq(
       "org.apache.flume" % "flume-ng-sdk" % "1.2.0" % "compile",
       "com.github.sgroschupf" % "zkclient" % "0.1",
-      "org.twitter4j" % "twitter4j-stream" % "3.0.3"
+      "org.twitter4j" % "twitter4j-stream" % "3.0.3",
+      "com.typesafe.akka" % "akka-zeromq" % "2.0.3"
     )
   ) ++ assemblySettings ++ extraAssemblySettings
 
diff --git a/streaming/src/main/scala/spark/streaming/StreamingContext.scala b/streaming/src/main/scala/spark/streaming/StreamingContext.scala
index f15e6bd23d79dd9b14dbc14c55791b51c450f015..2ca7dcc218222786332278acd1c77aa3ff0d8d3c 100644
--- a/streaming/src/main/scala/spark/streaming/StreamingContext.scala
+++ b/streaming/src/main/scala/spark/streaming/StreamingContext.scala
@@ -177,7 +177,7 @@ class StreamingContext private (
   }
 
   /**
-   * ZeroMQ stream receiver
+   * Create an input stream that receives messages pushed by a zeromq publisher.
    * @param publisherUrl Url of remote zeromq publisher
    * @param zeroMQ topic to subscribe to
    * @param bytesToObjects A zeroMQ stream publishes sequence of frames for each topic and each frame has sequence