Merge pull request #2 from paulyi/master

Fixed a bug with the global timeouts.