simlified
Merge pull request #446 from john-hill/rebroadcast

simlified