Made stuff work
Merge branch 'master' of https://github.com/toukmond/broadcast