modifs 17 sept
Merge branch 'master' into gh-pages