fixing online website
Merge branch 'master' into v1.0