Better announcement support
Merge pull request #4 from liftopia/moar-better-announcements

Better announcement support