page updated
Merge branch 'gh-directory-structured' into gh-pages