Merge pull request #1056 from annando/twitter-loop