Merged in changes from TwitCloud