Merge pull request #124 from optout21/broadcast-comment