diff --git a/core/src/main/scala/spark/BitTorrentBroadcast.scala b/core/src/main/scala/spark/BitTorrentBroadcast.scala
index 96d3643ffd9b237b8c6136e11148f4e12ac3a68a..e9339290cbc5f8c91d188587192889a63068c19f 100644
--- a/core/src/main/scala/spark/BitTorrentBroadcast.scala
+++ b/core/src/main/scala/spark/BitTorrentBroadcast.scala
@@ -1079,6 +1079,9 @@ extends Logging {
   def initialize (isMaster__ : Boolean): Unit = {
     synchronized {
       if (!initialized) {
+        // Fix for issue #42
+        MasterHostAddress_ =
+          System.getProperty ("spark.broadcast.masterHostAddress", "")
         MasterTrackerPort_ = 
           System.getProperty ("spark.broadcast.masterTrackerPort", "11111").toInt
         BlockSize_ = 
diff --git a/core/src/main/scala/spark/ChainedBroadcast.scala b/core/src/main/scala/spark/ChainedBroadcast.scala
index afd3c0293c3c31f9b37a85023f12e263bc034a92..d13553afde11fa9b3629561d011c4c47b3648e9a 100644
--- a/core/src/main/scala/spark/ChainedBroadcast.scala
+++ b/core/src/main/scala/spark/ChainedBroadcast.scala
@@ -745,6 +745,9 @@ extends Logging {
   def initialize (isMaster__ : Boolean): Unit = {
     synchronized {
       if (!initialized) {
+        // Fix for issue #42
+        MasterHostAddress_ =
+          System.getProperty ("spark.broadcast.masterHostAddress", "")
         MasterTrackerPort_ = 
           System.getProperty ("spark.broadcast.masterTrackerPort", "22222").toInt
         BlockSize_ =