added a timeout handler to error fallback
Merge pull request #10 from thomasdavis/gh-pages

added a timeout handler to error fallback