Joan
Merge branch 'master' into gh-pages
update gh-pages