adding a delay to prevent lags
Merge branch 'master' into gh-pages