added timeout
Merge pull request #64 from gsn/gh-pages

added timeout
Merge pull request #65 from gsn/staging

Staging