Broadcast refactoring part 1.
Merge pull request #88 from wiredearp/master

Broadcast refactoring part 1.
Merge branch 'master' into 0.0.5-ts
Pom over it