Tentative fix for issue #2 - Extension sometimes hang
Merge branch 'master' into timeout
Merge pull request #3 from PBoudreau/timeout

Fixes #2 - Extension sometimes hang