Add a timeout to make it work better
Merge branch 'master' into gh-pages