diff -uNr a/blatta/Makefile b/blatta/Makefile
--- a/blatta/Makefile false
+++ b/blatta/Makefile 58abf7c81c8f6a960d5a083ee890b0b7c4d3f8834ecef3d4523522e50af04fd4893eed6aa16afdcfc491fea6d583543914efe8c24f60a143a2cb028360187492
@@ -0,0 +1,21 @@
+VERSION := 9980
+
+DISTFILES = Makefile blatta README.txt lib migrations tests test_net_configs start_test_net.sh
+
+all:
+	echo "Nothing to do."
+
+dist:
+	mkdir blatta-$(VERSION)
+	cp -r $(DISTFILES) blatta-$(VERSION)
+	tar cvzf blatta-$(VERSION).tar.gz --exclude='*.db*' blatta-$(VERSION)
+	rm -rf blatta-$(VERSION)
+
+clean:
+	rm -rf blatta-$(VERSION).diff blatta-$(VERSION).diff.escaped blatta-$(VERSION) 
+	find . -name "*.swp" -delete
+	find . -name "*.pyc" -delete
+	rm *.tar.gz
+
+test:
+	python -m unittest discover -v
diff -uNr a/blatta/lib/broadcast.py b/blatta/lib/broadcast.py
--- a/blatta/lib/broadcast.py b73f1a4afa94caa17167b0316ce1ad893c33e46f3e5114230b808babc21e4c1f9a3327576e890114debe2f48e2fbc4a16533a02e824d1080cdc80268a39f30bf
+++ b/blatta/lib/broadcast.py 478c810c2fdf1e66601ac0beb660e36de1ede7bf64c450cfc0c909efab2cbbddd6ea4941c300611ae1010e83d4421fbd317fdddcfd6221aecabba59d7f39606c
@@ -1,7 +1,6 @@
 import logging
 import time
 import hashlib
-import binascii
 from message import Message
 from message import BROADCAST
 
@@ -9,7 +8,7 @@
 class Broadcast(Message):
     def __init__(self, message, state):
         message['command'] = BROADCAST
-        message['bounces'] = 0
+        message['bounces'] = message.get('bounces', 0)
         super(Broadcast, self).__init__(message, state)
 
     def send(self):
diff -uNr a/blatta/lib/station.py b/blatta/lib/station.py
--- a/blatta/lib/station.py 4a412c5198c031650023fcbeb12ecb8f2144d9cef45b9996873c444a8fc246e61b96755250dd0d76ef7b9087cbb49121ce7bcbadc2e043ac7b0114fd5514eb4f
+++ b/blatta/lib/station.py b715a5e7a750d2bb552b5792e87aa5741f36b521f3c68d17b312d49d9872c842b1f1e4c87db6e733ef3836b59d91cdc66b9217c908fb3a74dd5dedd485eda4a1
@@ -1,6 +1,6 @@
 import time
 
-VERSION = 9981
+VERSION = 9980
 
 import binascii
 import logging
diff -uNr a/blatta/start_test_net.sh b/blatta/start_test_net.sh
--- a/blatta/start_test_net.sh afcbbcf791e1f0e90125a8ffda4a018fb172fae6c074bf5dd046371662befea5ca980e28bb23de5a5c3f1a6b0283b628605bdea22fc5c425736b89fb12219442
+++ b/blatta/start_test_net.sh ceeed9852da4707de013e985b983a6b7b347dcc6d5375b13323505853749f8a6fbddc1bac8bef3fa81186e8d5cf44d352705503cb4a7f2f6ed27a37d73887ae5
@@ -1,6 +1,6 @@
 #!/bin/bash
 
 # start 3 servers on different ports
-./blatta --log-level debug --channel-name \#aleth --irc-port 9968 --udp-port 7778 --db-path a.db --address-table-path test_net_configs/a.py > logs/a &
-./blatta --log-level debug --channel-name \#aleth --irc-port 6669 --udp-port 7779 --db-path b.db --address-table-path test_net_configs/b.py > logs/b &
-./blatta --log-level debug --channel-name \#aleth --irc-port 6670 --udp-port 7780 --db-path c.db --address-table-path test_net_configs/c.py > logs/c &
+./blatta --channel-name \#aleth --irc-port 9968 --udp-port 7778 --db-path a.db --address-table-path test_net_configs/a.py > logs/a &
+./blatta --channel-name \#aleth --irc-port 6669 --udp-port 7779 --db-path b.db --address-table-path test_net_configs/b.py > logs/b &
+./blatta --channel-name \#aleth --irc-port 6670 --udp-port 7780 --db-path c.db --address-table-path test_net_configs/c.py > logs/c &