Adding in lahiff's improvements
AND fixing a tab.
AND allowing for a return value of 'None' as opposed to None in the announce script...