Merge pull request #7 from joelpurra/broadcast-date

Crash on broadcast messages, because they don't have a timestamp