diff --git a/core/src/main/scala/kafka/admin/ListTopicCommand.scala b/core/src/main/scala/kafka/admin/ListTopicCommand.scala
index f91eca2..f455df4 100644
--- a/core/src/main/scala/kafka/admin/ListTopicCommand.scala
+++ b/core/src/main/scala/kafka/admin/ListTopicCommand.scala
@@ -55,7 +55,7 @@ object ListTopicCommand {
       zkClient = new ZkClient(zkConnect, 30000, 30000, ZKStringSerializer)
 
       if (topic == "")
-        topicList = ZkUtils.getChildren(zkClient, ZkUtils.BrokerTopicsPath)
+        topicList = ZkUtils.getChildren(zkClient, ZkUtils.BrokerTopicsPath).sorted
       else
         topicList = List(topic)
 
diff --git a/core/src/main/scala/kafka/api/TopicMetadata.scala b/core/src/main/scala/kafka/api/TopicMetadata.scala
index 409de76..d67e92e 100644
--- a/core/src/main/scala/kafka/api/TopicMetadata.scala
+++ b/core/src/main/scala/kafka/api/TopicMetadata.scala
@@ -108,6 +108,17 @@ case class PartitionMetadata(partitionId: Int,
     buffer.putInt(isr.size)
     isr.foreach(r => buffer.putInt(r.id))
   }
+
+  override def toString(): String = {
+    val partitionMetadataString = new StringBuilder
+    partitionMetadataString.append("partition_id: " + partitionId)
+    partitionMetadataString.append("; leader: " + (if (leader.isEmpty) -1 else leader.get.id))
+    partitionMetadataString.append("; replica_count: " + replicas.size)
+    partitionMetadataString.append("; replicas: " + replicas.map(_.id).mkString(","))
+    partitionMetadataString.append("; isr_count: " + isr.size)
+    partitionMetadataString.append("; isr: " + isr.map(_.id).mkString(","))
+    partitionMetadataString.toString()
+  }
 }