giving Timmy a timeout
Merge pull request #1 from ganye/master

giving Timmy a timeout